No bug - minor non-unified build fixes.
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sun, 08 Dec 2019 19:51:44 +0000
changeset 568132 38b152639af2ba6058878002eaefe68e16bbad36
parent 568131 09770afb0f03b135298f892bb664ddaaf76b1cee
child 568133 d9fe6eaf1c0d3c4eb2b8642b8d9a5baf2a920904
push id12493
push userffxbld-merge
push dateMon, 06 Jan 2020 15:38:57 +0000
treeherdermozilla-beta@63ae456b848d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone73.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
No bug - minor non-unified build fixes. Differential Revision: https://phabricator.services.mozilla.com/D56305
dom/base/FullscreenChange.h
dom/security/FramingChecker.h
--- a/dom/base/FullscreenChange.h
+++ b/dom/base/FullscreenChange.h
@@ -67,25 +67,25 @@ class FullscreenChange : public LinkedLi
   nsCOMPtr<dom::Document> mDocument;
   RefPtr<Promise> mPromise;
 };
 
 class FullscreenRequest : public FullscreenChange {
  public:
   static const ChangeType kType = eEnter;
 
-  static UniquePtr<FullscreenRequest> Create(Element* aElement,
+  static UniquePtr<FullscreenRequest> Create(dom::Element* aElement,
                                              dom::CallerType aCallerType,
                                              ErrorResult& aRv) {
     RefPtr<Promise> promise = Promise::Create(aElement->GetOwnerGlobal(), aRv);
     return WrapUnique(
         new FullscreenRequest(aElement, promise.forget(), aCallerType, true));
   }
 
-  static UniquePtr<FullscreenRequest> CreateForRemote(Element* aElement) {
+  static UniquePtr<FullscreenRequest> CreateForRemote(dom::Element* aElement) {
     return WrapUnique(new FullscreenRequest(aElement, nullptr,
                                             dom::CallerType::NonSystem, false));
   }
 
   ~FullscreenRequest() { MOZ_COUNT_DTOR(FullscreenRequest); }
 
   dom::Element* Element() const { return mElement; }
 
--- a/dom/security/FramingChecker.h
+++ b/dom/security/FramingChecker.h
@@ -2,16 +2,18 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #ifndef mozilla_dom_FramingChecker_h
 #define mozilla_dom_FramingChecker_h
 
+#include "nsStringFwd.h"
+
 class nsIDocShell;
 class nsIChannel;
 class nsIHttpChannel;
 class nsIDocShellTreeItem;
 class nsIURI;
 class nsIContentSecurityPolicy;
 
 namespace mozilla {
@@ -42,16 +44,17 @@ class FramingChecker {
    * @param aPolicy the header value string from the frame
    * @param aInnerWindowID the inner window id for logging
    * to the console.
    */
   static void ReportError(const char* aMessageTag, nsIURI* aParentURI,
                           nsIURI* aChildURI, const nsAString& aPolicy,
                           uint64_t aInnerWindowID);
   static void ReportError(const char* aMessageTag,
-                          BrowsingContext* aParentContext, nsIURI* aChildURI,
-                          const nsAString& aPolicy, uint64_t aInnerWindowID);
+                          mozilla::dom::BrowsingContext* aParentContext,
+                          nsIURI* aChildURI, const nsAString& aPolicy,
+                          uint64_t aInnerWindowID);
 
   static bool CheckOneFrameOptionsPolicy(nsIHttpChannel* aHttpChannel,
                                          const nsAString& aPolicy);
 };
 
 #endif /* mozilla_dom_FramingChecker_h */