Bug 1517241 - Fix some Android / non-unified bustage.
authorEmilio Cobos Álvarez <emilio@crisal.io>
Thu, 03 Jan 2019 18:19:33 +0100
changeset 509550 120fccb288c0839bde15c42987c247c39e0b6b50
parent 509549 f0a91d36587266d7454a450c6044d573664fbed5
child 509551 8dc3509de69e9a2315bb1d7b1c012994a70ee98a
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1517241
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517241 - Fix some Android / non-unified bustage. CLOSED TREE
dom/base/PopupBlocker.cpp
dom/base/nsDOMWindowList.cpp
dom/base/nsDataDocumentContentPolicy.cpp
--- a/dom/base/PopupBlocker.cpp
+++ b/dom/base/PopupBlocker.cpp
@@ -4,16 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/PopupBlocker.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/TextEvents.h"
 #include "nsXULPopupManager.h"
+#include "nsIPermissionManager.h"
 
 namespace mozilla {
 namespace dom {
 
 namespace {
 
 static char* sPopupAllowedEvents;
 
--- a/dom/base/nsDOMWindowList.cpp
+++ b/dom/base/nsDOMWindowList.cpp
@@ -26,17 +26,17 @@ nsDOMWindowList::~nsDOMWindowList() {}
 void nsDOMWindowList::SetDocShell(nsIDocShell* aDocShell) {
   mDocShellNode = aDocShell;  // Weak Reference
 }
 
 void nsDOMWindowList::EnsureFresh() {
   nsCOMPtr<nsIWebNavigation> shellAsNav = do_QueryInterface(mDocShellNode);
 
   if (shellAsNav) {
-    nsCOMPtr<Document> doc;
+    nsCOMPtr<dom::Document> doc;
     shellAsNav->GetDocument(getter_AddRefs(doc));
 
     if (doc) {
       doc->FlushPendingNotifications(FlushType::ContentAndNotify);
     }
   }
 }
 
--- a/dom/base/nsDataDocumentContentPolicy.cpp
+++ b/dom/base/nsDataDocumentContentPolicy.cpp
@@ -43,17 +43,17 @@ nsDataDocumentContentPolicy::ShouldLoad(
   nsCOMPtr<nsISupports> requestingContext = aLoadInfo->GetLoadingContext();
 
   MOZ_ASSERT(contentType == nsContentUtils::InternalContentPolicyTypeToExternal(
                                 contentType),
              "We should only see external content policy types here.");
 
   *aDecision = nsIContentPolicy::ACCEPT;
   // Look for the document.  In most cases, requestingContext is a node.
-  nsCOMPtr<Document> doc;
+  nsCOMPtr<mozilla::dom::Document> doc;
   nsCOMPtr<nsINode> node = do_QueryInterface(requestingContext);
   if (node) {
     doc = node->OwnerDoc();
   } else {
     if (nsCOMPtr<nsPIDOMWindowOuter> window =
             do_QueryInterface(requestingContext)) {
       doc = window->GetDoc();
     }
@@ -69,17 +69,17 @@ nsDataDocumentContentPolicy::ShouldLoad(
     // ...but let static (print/print preview) documents to load fonts.
     if (!doc->IsStaticDocument() ||
         contentType != nsIContentPolicy::TYPE_FONT) {
       *aDecision = nsIContentPolicy::REJECT_TYPE;
       return NS_OK;
     }
   }
 
-  Document *docToCheckForImage = doc->GetDisplayDocument();
+  mozilla::dom::Document *docToCheckForImage = doc->GetDisplayDocument();
   if (!docToCheckForImage) {
     docToCheckForImage = doc;
   }
 
   if (docToCheckForImage->IsBeingUsedAsImage()) {
     // We only allow SVG images to load content from URIs that are local and
     // also satisfy one of the following conditions:
     //  - URI inherits security context, e.g. data URIs