Bug 1396399 - Clarify rules for applying activeTab permission to content scripts. r=kmag, r=bz

MozReview-Commit-ID: 9xPDX8Qk2iR
2017-11-04 21:06:20 -07:00
parent 09c4378db5
commit 8cef91f7e3
22 changed files with 175 additions and 29 deletions
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -245,7 +245,9 @@ nsGenericHTMLFrameElement::LoadSrc()
    return NS_OK;
  }

-  nsresult rv = mFrameLoader->LoadFrame();
+  bool origSrc = !mSrcLoadHappened;
+  mSrcLoadHappened = true;
+  nsresult rv = mFrameLoader->LoadFrame(origSrc);
 #ifdef DEBUG
  if (NS_FAILED(rv)) {
    NS_WARNING("failed to load URL");