Bug 1340498 - Fix unified sources build errors r?mrbkap draft
authorDoug Thayer <dothayer@mozilla.com>
Fri, 13 Apr 2018 11:04:47 -0700
changeset 781850 9915ea12901add88ce7667e64e98c15266c6a8cf
parent 781849 b640b5eefd79e4b8ee910c421162fcd9e4553963
push id106430
push userbmo:dothayer@mozilla.com
push dateFri, 13 Apr 2018 18:31:44 +0000
reviewersmrbkap
bugs1340498
milestone61.0a1
Bug 1340498 - Fix unified sources build errors r?mrbkap Adding the Places* files into unified sources pushed the unified sources into a situation that exposed a strangely large number of errors. This seems to be the minimum set of changes I could make to resolve all of the issues. MozReview-Commit-ID: 2ZCqTr0wErR
dom/base/ShadowRoot.cpp
dom/base/StyleSheetList.h
dom/base/WindowDestroyedEvent.cpp
dom/base/nsDOMMutationObserver.cpp
dom/base/nsINode.cpp
dom/base/nsWindowMemoryReporter.cpp
layout/style/ServoStyleSetInlines.h
--- a/dom/base/ShadowRoot.cpp
+++ b/dom/base/ShadowRoot.cpp
@@ -12,16 +12,17 @@
 #include "nsContentUtils.h"
 #include "nsIStyleSheetLinkingElement.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLSlotElement.h"
 #include "nsXBLPrototypeBinding.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/StyleSheet.h"
 #include "mozilla/StyleSheetInlines.h"
+#include "mozilla/dom/StyleSheetList.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(ShadowRoot)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ShadowRoot,
                                                   DocumentFragment)
--- a/dom/base/StyleSheetList.h
+++ b/dom/base/StyleSheetList.h
@@ -2,16 +2,17 @@
 /* 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_StyleSheetList_h
 #define mozilla_dom_StyleSheetList_h
 
+#include "nsContentUtils.h"
 #include "mozilla/dom/DocumentOrShadowRoot.h"
 #include "nsStubMutationObserver.h"
 #include "nsWrapperCache.h"
 
 class nsINode;
 
 namespace mozilla {
 class StyleSheet;
--- a/dom/base/WindowDestroyedEvent.cpp
+++ b/dom/base/WindowDestroyedEvent.cpp
@@ -3,16 +3,17 @@
 #include "nsJSUtils.h"
 #include "jsapi.h"              // for JSAutoRequest
 #include "js/Wrapper.h"
 #include "nsIPrincipal.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIAppStartup.h"
 #include "nsToolkitCompsCID.h"
 #include "nsCOMPtr.h"
+#include "nsContentUtils.h"
 
 namespace mozilla {
 
 // Try to match compartments that are not web content by matching compartments
 // with principals that are either the system principal or an expanded principal.
 // This may not return true for all non-web-content compartments.
 struct BrowserCompartmentMatcher : public js::CompartmentFilter {
   bool match(JSCompartment* aC) const override
--- a/dom/base/nsDOMMutationObserver.cpp
+++ b/dom/base/nsDOMMutationObserver.cpp
@@ -21,17 +21,19 @@
 #include "nsServiceManagerUtils.h"
 #include "nsTextFragment.h"
 #include "nsThreadUtils.h"
 
 using namespace mozilla;
 
 using mozilla::dom::TreeOrderComparator;
 using mozilla::dom::Animation;
+using mozilla::dom::DocGroup;
 using mozilla::dom::Element;
+using mozilla::dom::HTMLSlotElement;
 
 AutoTArray<RefPtr<nsDOMMutationObserver>, 4>*
   nsDOMMutationObserver::sScheduledMutationObservers = nullptr;
 
 uint32_t nsDOMMutationObserver::sMutationLevel = 0;
 uint64_t nsDOMMutationObserver::sCount = 0;
 
 AutoTArray<AutoTArray<RefPtr<nsDOMMutationObserver>, 4>, 4>*
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
@@ -87,16 +87,17 @@
 #include "nsPresContext.h"
 #include "nsString.h"
 #include "nsStyleConsts.h"
 #include "nsSVGUtils.h"
 #include "nsTextNode.h"
 #include "nsUnicharUtils.h"
 #include "nsXBLBinding.h"
 #include "nsXBLPrototypeBinding.h"
+#include "nsWindowSizes.h"
 #include "mozilla/Preferences.h"
 #include "xpcpublic.h"
 #include "nsCSSParser.h"
 #include "HTMLLegendElement.h"
 #include "nsWrapperCacheInlines.h"
 #include "WrapperFactory.h"
 #include <algorithm>
 #include "nsGlobalWindow.h"
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@@ -19,16 +19,17 @@
 #include "js/MemoryMetrics.h"
 #include "nsQueryObject.h"
 #include "nsServiceManagerUtils.h"
 #ifdef MOZ_XUL
 #include "nsXULPrototypeCache.h"
 #endif
 
 using namespace mozilla;
+using namespace mozilla::dom;
 
 StaticRefPtr<nsWindowMemoryReporter> sWindowReporter;
 
 /**
  * Don't trigger a ghost window check when a DOM window is detached if we've
  * run it this recently.
  */
 const int32_t kTimeBetweenChecks = 45; /* seconds */
--- a/layout/style/ServoStyleSetInlines.h
+++ b/layout/style/ServoStyleSetInlines.h
@@ -5,22 +5,26 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_ServoStyleSetInlines_h
 #define mozilla_ServoStyleSetInlines_h
 
 #include "mozilla/ServoStyleSet.h"
 #include "mozilla/ServoBindings.h"
 
+namespace mozilla {
+
 nscoord
 ServoStyleSet::EvaluateSourceSizeList(
   const RawServoSourceSizeList* aSourceSizeList) const
 {
   return Servo_SourceSizeList_Evaluate(mRawSet.get(), aSourceSizeList);
 }
 
 already_AddRefed<ComputedStyle>
 ServoStyleSet::ResolveServoStyle(dom::Element* aElement)
 {
   return Servo_ResolveStyle(aElement, mRawSet.get()).Consume();
 }
 
+} // namespace mozilla
+
 #endif // mozilla_ServoStyleSetInlines_h