Backed out changeset 395b95afd795 (bug 1487964) for mochitest failures on test_resource_timing_nocors.

docshell/base/nsDocShell.cpp

@@ -764,7 +764,6 @@ nsDocShell::LoadURI(nsDocShellLoadState* aLoadState)
                       resultPrincipalURI,
                       aLoadState->KeepResultPrincipalURIIfSet(),
                       aLoadState->LoadReplace(),
-                      aLoadState->GetIsFromProcessingFrameAttributes(),
                       aLoadState->Referrer(),
                       aLoadState->ReferrerPolicy(),
                       aLoadState->TriggeringPrincipal(),
@@ -4815,8 +4814,7 @@ nsDocShell::LoadErrorPage(nsIURI* aErrorURI, nsIURI* aFailedURI, nsIChannel* aFa
     mLSHE->AbandonBFCacheEntry();
   }
 
-  return InternalLoad(aErrorURI, nullptr, Nothing(), false, false,
+  return InternalLoad(aErrorURI, nullptr, Nothing(), false, false, nullptr, RP_Unset,
-                      false, nullptr, RP_Unset,
                       nsContentUtils::GetSystemPrincipal(), nullptr,
                       INTERNAL_LOAD_FLAGS_NONE, EmptyString(),
                       VoidCString(), VoidString(), nullptr, nullptr,
@@ -4916,7 +4914,6 @@ nsDocShell::Reload(uint32_t aReloadFlags)
                       emplacedResultPrincipalURI,
                       false,
                       loadReplace,
-                      false,           // IsFromProcessingFrameAttributes
                       referrerURI,
                       referrerPolicy,
                       triggeringPrincipal,
@@ -9005,7 +9002,6 @@ public:
                     Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
                     bool aKeepResultPrincipalURIIfSet,
                     bool aLoadReplace,
-                    bool aIsFromProcessingFrameAttributes,
                     nsIURI* aReferrer, uint32_t aReferrerPolicy,
                     nsIPrincipal* aTriggeringPrincipal,
                     nsIPrincipal* aPrincipalToInherit,
@@ -9028,7 +9024,6 @@ public:
     , mResultPrincipalURI(aResultPrincipalURI)
     , mKeepResultPrincipalURIIfSet(aKeepResultPrincipalURIIfSet)
     , mLoadReplace(aLoadReplace)
-    , mIsFromProcessingFrameAttributes(aIsFromProcessingFrameAttributes)
     , mReferrer(aReferrer)
     , mReferrerPolicy(aReferrerPolicy)
     , mTriggeringPrincipal(aTriggeringPrincipal)
@@ -9053,7 +9048,6 @@ public:
     return mDocShell->InternalLoad(mURI, mOriginalURI, mResultPrincipalURI,
                                    mKeepResultPrincipalURIIfSet,
                                    mLoadReplace,
-                                   mIsFromProcessingFrameAttributes,
                                    mReferrer,
                                    mReferrerPolicy,
                                    mTriggeringPrincipal, mPrincipalToInherit,
@@ -9076,7 +9070,6 @@ private:
   Maybe<nsCOMPtr<nsIURI>> mResultPrincipalURI;
   bool mKeepResultPrincipalURIIfSet;
   bool mLoadReplace;
-  bool mIsFromProcessingFrameAttributes;
   nsCOMPtr<nsIURI> mReferrer;
   uint32_t mReferrerPolicy;
   nsCOMPtr<nsIPrincipal> mTriggeringPrincipal;
@@ -9113,7 +9106,6 @@ nsDocShell::InternalLoad(nsIURI* aURI,
                          Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
                          bool aKeepResultPrincipalURIIfSet,
                          bool aLoadReplace,
-                         bool aIsFromProcessingFrameAttributes,
                          nsIURI* aReferrer,
                          uint32_t aReferrerPolicy,
                          nsIPrincipal* aTriggeringPrincipal,
@@ -9466,7 +9458,6 @@ nsDocShell::InternalLoad(nsIURI* aURI,
                                         aResultPrincipalURI,
                                         aKeepResultPrincipalURIIfSet,
                                         aLoadReplace,
-                                        aIsFromProcessingFrameAttributes,
                                         aReferrer,
                                         aReferrerPolicy,
                                         aTriggeringPrincipal,
@@ -9565,8 +9556,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
       nsCOMPtr<nsIRunnable> ev =
         new InternalLoadEvent(this, aURI, aOriginalURI, aResultPrincipalURI,
                               aKeepResultPrincipalURIIfSet,
-                              aLoadReplace, aIsFromProcessingFrameAttributes,
+                              aLoadReplace, aReferrer, aReferrerPolicy,
-                              aReferrer, aReferrerPolicy,
                               aTriggeringPrincipal, principalToInherit,
                               aFlags, aTypeHint, aPostData,
                               aHeadersData, aLoadType, aSHEntry, aFirstParty,
@@ -10080,7 +10070,6 @@ nsDocShell::InternalLoad(nsIURI* aURI,
   nsCOMPtr<nsIRequest> req;
   rv = DoURILoad(aURI, aOriginalURI, aResultPrincipalURI,
                  aKeepResultPrincipalURIIfSet, aLoadReplace,
-                 aIsFromProcessingFrameAttributes,
                  loadFromExternal,
                  (aFlags & INTERNAL_LOAD_FLAGS_FORCE_ALLOW_DATA_URI),
                  (aFlags & INTERNAL_LOAD_FLAGS_ORIGINAL_FRAME_SRC),
@@ -10229,7 +10218,6 @@ nsDocShell::DoURILoad(nsIURI* aURI,
                       Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
                       bool aKeepResultPrincipalURIIfSet,
                       bool aLoadReplace,
-                      bool aIsFromProcessingFrameAttributes,
                       bool aLoadFromExternal,
                       bool aForceAllowDataURI,
                       bool aOriginalFrameSrc,
@@ -10405,7 +10393,7 @@ nsDocShell::DoURILoad(nsIURI* aURI,
     securityFlags |= nsILoadInfo::SEC_SANDBOXED;
   }
 
-  RefPtr<LoadInfo> loadInfo =
+  nsCOMPtr<nsILoadInfo> loadInfo =
     (aContentPolicyType == nsIContentPolicy::TYPE_DOCUMENT) ?
       new LoadInfo(loadingWindow, aTriggeringPrincipal, topLevelLoadingContext,
                    securityFlags) :
@@ -10451,10 +10439,6 @@ nsDocShell::DoURILoad(nsIURI* aURI,
   rv = loadInfo->SetIsDocshellReload(mLoadType & LOAD_CMD_RELOAD);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (aIsFromProcessingFrameAttributes) {
-    loadInfo->SetIsFromProcessingFrameAttributes();
-  }
-
   if (!isSrcdoc) {
     rv = NS_NewChannelInternal(getter_AddRefs(channel),
                                aURI,
@@ -12165,7 +12149,6 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType)
                     emplacedResultPrincipalURI,
                     false,
                     loadReplace,
-                    false,              // IsFromProcessingFrameAttributes
                     referrerURI,
                     referrerPolicy,
                     triggeringPrincipal,
@@ -13358,7 +13341,6 @@ nsDocShell::OnLinkClickSync(nsIContent* aContent,
                              Nothing(),                 // Let the protocol handler assign it
                              false,
                              false,                     // LoadReplace
-                             false,                     // IsFromProcessingFrameAttributes
                              referer,                   // Referer URI
                              refererPolicy,             // Referer policy
                              triggeringPrincipal,

docshell/base/nsDocShell.h

@@ -532,7 +532,6 @@ private: // member functions
                      mozilla::Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
                      bool aKeepResultPrincipalURIIfSet,
                      bool aLoadReplace,
-                     bool aIsFromProcessingFrameAttributes,
                      bool aLoadFromExternal,
                      bool aForceAllowDataURI,
                      bool aOriginalFrameSrc,

docshell/base/nsDocShellLoadState.cpp

@@ -30,7 +30,6 @@ nsDocShellLoadState::nsDocShellLoadState()
   , mTypeHint(VoidCString())
   , mFileName(VoidString())
   , mDocShellInternalLoadFlags(0)
-  , mIsFromProcessingFrameAttributes(false)
 {
 }
 

docshell/base/nsDocShellLoadState.h

@@ -165,9 +165,6 @@ public:
   // information and origin attributes.
   nsresult SetupTriggeringPrincipal(const mozilla::OriginAttributes& aOriginAttributes);
 
-  void SetIsFromProcessingFrameAttributes() { mIsFromProcessingFrameAttributes = true; }
-  bool GetIsFromProcessingFrameAttributes() { return mIsFromProcessingFrameAttributes; }
-
   // When loading a document through nsDocShell::LoadURI(), a special set of
   // flags needs to be set based on other values in nsDocShellLoadState. This
   // function calculates those flags, before the LoadState is passed to
@@ -291,10 +288,6 @@ protected:
   // nsDocShell::InternalLoad, taken from the INTERNAL_LOAD consts in
   // nsIDocShell.idl
   uint32_t mDocShellInternalLoadFlags;
-
-  // This will be true if this load is triggered by attribute changes.
-  // See nsILoadInfo.isFromProcessingFrameAttributes
-  bool mIsFromProcessingFrameAttributes;
 };
 
 #endif /* nsDocShellLoadState_h__ */

docshell/base/nsIDocShell.idl

@@ -137,9 +137,6 @@ interface nsIDocShell : nsIDocShellTreeItem
    * @param aLoadReplace         - If set LOAD_REPLACE flag will be set on the
    *                               channel. aOriginalURI is null, this argument is
    *                               ignored.
-   * @param aIsFromProcessingFrameAttributes
-   *          - If this is a load triggered by changing frame attributes.
-   *            See nsILoadInfo.isFromProcessingFrameAttributes
    * @param aReferrer            - Referring URI
    * @param aReferrerPolicy      - Referrer policy
    * @param aTriggeringPrincipal - A non-null principal that initiated that load.
@@ -187,7 +184,6 @@ interface nsIDocShell : nsIDocShellTreeItem
                               [const] in MaybeURI aResultPrincipalURI,
                               in bool aKeepResultPrincipalURIIfSet,
                               in boolean aLoadReplace,
-                              in boolean aIsFromProcessingFrameAttributes,
                               in nsIURI aReferrer,
                               in unsigned long aReferrerPolicy,
                               in nsIPrincipal aTriggeringPrincipal,

dom/base/nsFrameLoader.cpp

@@ -464,8 +464,6 @@ nsFrameLoader::ReallyStartLoadingInternal()
             nsIWebNavigation::LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
   }
 
-  loadState->SetIsFromProcessingFrameAttributes();
-
   // Kick off the load...
   bool tmpState = mNeedsAsyncDestroy;
   mNeedsAsyncDestroy = true;

ipc/glue/BackgroundUtils.cpp

@@ -453,8 +453,7 @@ LoadInfoToLoadInfoArgs(nsILoadInfo *aLoadInfo,
       aLoadInfo->GetLoadTriggeredFromExternal(),
       aLoadInfo->GetServiceWorkerTaintingSynthesized(),
       aLoadInfo->GetDocumentHasUserInteracted(),
-      aLoadInfo->GetDocumentHasLoaded(),
+      aLoadInfo->GetDocumentHasLoaded()
-      aLoadInfo->GetIsFromProcessingFrameAttributes()
       );
 
   return NS_OK;
@@ -572,7 +571,7 @@ LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
       loadInfoArgs.controller().get_IPCServiceWorkerDescriptor()));
   }
 
-  RefPtr<mozilla::LoadInfo> loadInfo =
+  nsCOMPtr<nsILoadInfo> loadInfo =
     new mozilla::LoadInfo(loadingPrincipal,
                           triggeringPrincipal,
                           principalToInherit,
@@ -620,10 +619,6 @@ LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
                           loadInfoArgs.documentHasLoaded()
                           );
 
-  if (loadInfoArgs.isFromProcessingFrameAttributes()) {
-    loadInfo->SetIsFromProcessingFrameAttributes();
-  }
-
    loadInfo.forget(outLoadInfo);
    return NS_OK;
 }

netwerk/base/LoadInfo.cpp

@@ -94,7 +94,6 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
   , mIsTrackerBlocked(false)
   , mDocumentHasUserInteracted(false)
   , mDocumentHasLoaded(false)
-  , mIsFromProcessingFrameAttributes(false)
 {
   MOZ_ASSERT(mLoadingPrincipal);
   MOZ_ASSERT(mTriggeringPrincipal);
@@ -367,7 +366,6 @@ LoadInfo::LoadInfo(nsPIDOMWindowOuter* aOuterWindow,
   , mIsTrackerBlocked(false)
   , mDocumentHasUserInteracted(false)
   , mDocumentHasLoaded(false)
-  , mIsFromProcessingFrameAttributes(false)
 {
   // Top-level loads are never third-party
   // Grab the information we can out of the window.
@@ -470,7 +468,6 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
   , mIsTrackerBlocked(rhs.mIsTrackerBlocked)
   , mDocumentHasUserInteracted(rhs.mDocumentHasUserInteracted)
   , mDocumentHasLoaded(rhs.mDocumentHasLoaded)
-  , mIsFromProcessingFrameAttributes(rhs.mIsFromProcessingFrameAttributes)
 {
 }
 
@@ -565,7 +562,6 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
   , mIsTrackerBlocked(false)
   , mDocumentHasUserInteracted(aDocumentHasUserInteracted)
   , mDocumentHasLoaded(aDocumentHasLoaded)
-  , mIsFromProcessingFrameAttributes(false)
 {
   // Only top level TYPE_DOCUMENT loads can have a null loadingPrincipal
   MOZ_ASSERT(mLoadingPrincipal || aContentPolicyType == nsIContentPolicy::TYPE_DOCUMENT);
@@ -1454,20 +1450,6 @@ LoadInfo::GetIsTopLevelLoad(bool *aResult)
   return NS_OK;
 }
 
-void
-LoadInfo::SetIsFromProcessingFrameAttributes()
-{
-  mIsFromProcessingFrameAttributes = true;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetIsFromProcessingFrameAttributes(bool *aIsFromProcessingFrameAttributes)
-{
-  MOZ_ASSERT(aIsFromProcessingFrameAttributes);
-  *aIsFromProcessingFrameAttributes = mIsFromProcessingFrameAttributes;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 LoadInfo::GetResultPrincipalURI(nsIURI **aURI)
 {

netwerk/base/LoadInfo.h

@@ -87,7 +87,6 @@ public:
   void SetUpgradeInsecureRequests();
   void SetBrowserUpgradeInsecureRequests();
   void SetBrowserWouldUpgradeInsecureRequests();
-  void SetIsFromProcessingFrameAttributes();
 
 private:
   // private constructor that is only allowed to be called from within
@@ -220,11 +219,6 @@ private:
   bool                             mIsTrackerBlocked;
   bool                             mDocumentHasUserInteracted;
   bool                             mDocumentHasLoaded;
-
-  // Is true if this load was triggered by processing the attributes of the
-  // browsing context container.
-  // See nsILoadInfo.isFromProcessingFrameAttributes
-  bool                             mIsFromProcessingFrameAttributes;
 };
 
 } // namespace net

netwerk/base/nsILoadInfo.idl

@@ -1068,11 +1068,4 @@ interface nsILoadInfo : nsISupports
     * See bug 1500908.
     */
   attribute nsICSPEventListener cspEventListener;
-
-  /**
-   * This attribute will be true if this is a load triggered by
-   * https://html.spec.whatwg.org/multipage/iframe-embed-object.html#process-the-iframe-attributes
-   * or https://html.spec.whatwg.org/multipage/obsolete.html#process-the-frame-attributes
-   */
-  [infallible] readonly attribute boolean isFromProcessingFrameAttributes;
 };

netwerk/ipc/NeckoChannelParams.ipdlh

@@ -110,7 +110,6 @@ struct LoadInfoArgs
   bool                        serviceWorkerTaintingSynthesized;
   bool                        documentHasUserInteracted;
   bool                        documentHasLoaded;
-  bool                        isFromProcessingFrameAttributes;
 };
 
 /**

netwerk/protocol/http/HttpBaseChannel.cpp

@@ -4413,10 +4413,11 @@ HttpBaseChannel::GetPerformanceStorage()
     return nullptr;
   }
 
-  if (mLoadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_SUBDOCUMENT &&
+  // We only add to the document's performance object if it has the same
-      !mLoadInfo->GetIsFromProcessingFrameAttributes()) {
+  // principal as the one triggering the load. This is to prevent navigations
-    // We only report loads caused by processing the attributes of the
+  // triggered _by_ the iframe from showing up in the parent document's
-    // browsing context container.
+  // performance entries if they have different origins.
+  if (!mLoadInfo->TriggeringPrincipal()->Equals(loadingDocument->NodePrincipal())) {
     return nullptr;
   }
 

testing/web-platform/meta/resource-timing/resource_subframe_self_navigation.html.ini

@@ -0,0 +1,13 @@
+[resource_subframe_self_navigation.html]
+  [Subsequent <iframe> navigations don't appear in the resource-timing buffer.]
+    expected: FAIL
+
+  [Subsequent <frame> navigations don't appear in the resource-timing buffer.]
+    expected: FAIL
+
+  [Subsequent <embed> navigations don't appear in the resource-timing buffer.]
+    expected: FAIL
+
+  [Subsequent <object> navigations don't appear in the resource-timing buffer.]
+    expected: FAIL
+