Bug 1590639 part 2: Fix non-unified build issues in layout/base. r=TYLin
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 23 Oct 2019 22:10:11 +0000
changeset 498897 db3fe5184abb0201fe0b7a6384cde1e6e52bbaca
parent 498896 7c82ce0af9f0b5589e08e8f69e6d7ab466aacab4
child 498898 7d697ed8c7276b155403c14daaa640be0ce4c8e4
push id98771
push userdholbert@mozilla.com
push dateThu, 24 Oct 2019 17:17:29 +0000
treeherderautoland@54471d01065b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersTYLin
bugs1590639
milestone72.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 1590639 part 2: Fix non-unified build issues in layout/base. r=TYLin Changes here: - Adding a "dom::" prefix in GeckoMVMContext.cpp (could've also added a "using" decl, but I'm just adding a one-off prefix to match "dom::Document" usage elsewhere in this file). - Giving nsLayoutUtils an include for ViewportFrame.h since it uses that type. - Giving nsPresArena.cpp an include for nsDisplayList.h to provide the DisplayListArenaObjectId enum type. Depends on D50163 Differential Revision: https://phabricator.services.mozilla.com/D50164
layout/base/GeckoMVMContext.cpp
layout/base/nsLayoutUtils.cpp
layout/base/nsPresArena.cpp
--- a/layout/base/GeckoMVMContext.cpp
+++ b/layout/base/GeckoMVMContext.cpp
@@ -131,17 +131,17 @@ bool GeckoMVMContext::IsInReaderMode() c
     return false;
   }
   static auto readerModeUriPrefix = NS_LITERAL_STRING("about:reader");
   return StringBeginsWith(uri, readerModeUriPrefix);
 }
 
 bool GeckoMVMContext::IsDocumentLoading() const {
   MOZ_ASSERT(mDocument);
-  return mDocument->GetReadyStateEnum() == Document::READYSTATE_LOADING;
+  return mDocument->GetReadyStateEnum() == dom::Document::READYSTATE_LOADING;
 }
 
 void GeckoMVMContext::SetResolutionAndScaleTo(float aResolution,
                                               ResolutionChangeOrigin aOrigin) {
   MOZ_ASSERT(mPresShell);
   mPresShell->SetResolutionAndScaleTo(aResolution, aOrigin);
 }
 
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -26,16 +26,17 @@
 #include "mozilla/ServoStyleSetInlines.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_font.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/Unused.h"
+#include "mozilla/ViewportFrame.h"
 #include "nsCharTraits.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "nsFontMetrics.h"
 #include "nsPresContext.h"
 #include "nsPresContextInlines.h"
 #include "nsIContent.h"
--- a/layout/base/nsPresArena.cpp
+++ b/layout/base/nsPresArena.cpp
@@ -6,16 +6,17 @@
  */
 
 /* arena allocation for the frame tree and closely-related objects */
 
 #include "nsPresArena.h"
 
 #include "mozilla/Poison.h"
 #include "nsDebug.h"
+#include "nsDisplayList.h"
 #include "nsPrintfCString.h"
 #include "FrameLayerBuilder.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/ComputedStyle.h"
 #include "mozilla/ComputedStyleInlines.h"
 #include "nsWindowSizes.h"
 
 #include <inttypes.h>