Bug 1449400 part 4 - Split some inline functions from ServoStyleSet.h…

… into an Inlines header. r=emilio

To remove the dependency from ServoStyleSet.h to ServoBindings.h.

MozReview-Commit-ID: 6YJ71AnQklL

dom/base/ResponsiveImageSelector.cpp

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/ResponsiveImageSelector.h"
-#include "mozilla/ServoStyleSet.h"
+#include "mozilla/ServoStyleSetInlines.h"
 #include "nsIURI.h"
 #include "nsIDocument.h"
 #include "nsContentUtils.h"

layout/base/RestyleManager.cpp

@@ -10,6 +10,7 @@
 #include "Layers.h"
 #include "LayerAnimationInfo.h" // For LayerAnimationInfo::sRecords
 #include "mozilla/StyleSetHandleInlines.h"
+#include "mozilla/ServoStyleSetInlines.h"
 #include "nsAnimationManager.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsCSSRendering.h"

layout/base/nsCSSFrameConstructor.cpp

@@ -24,6 +24,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ServoBindings.h"
+#include "mozilla/ServoStyleSetInlines.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsCSSPseudoElements.h"
 #include "nsAtom.h"

layout/style/ServoStyleSet.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ServoStyleSet.h"
+#include "mozilla/ServoStyleSetInlines.h"
 
 #include "gfxPlatformFontList.h"
 #include "mozilla/AutoRestyleTimelineMarker.h"

layout/style/ServoStyleSet.h

@@ -13,7 +13,6 @@
 #include "mozilla/MediaFeatureChange.h"
 #include "mozilla/PostTraversalTask.h"
 #include "mozilla/ServoBindingTypes.h"
-#include "mozilla/ServoBindings.h"
 #include "mozilla/ServoUtils.h"
 #include "mozilla/SheetType.h"
 #include "mozilla/UniquePtr.h"
@@ -133,9 +132,8 @@ class ServoStyleSet
   //
   // The SourceSizeList parameter can be null, in which case it will return
   // 100vw.
-  nscoord EvaluateSourceSizeList(const RawServoSourceSizeList* aSourceSizeList) const {
-    return Servo_SourceSizeList_Evaluate(mRawSet.get(), aSourceSizeList);
-  }
+  inline nscoord EvaluateSourceSizeList(
+      const RawServoSourceSizeList* aSourceSizeList) const;
 
   void InvalidateStyleForCSSRuleChanges();
 
@@ -342,10 +340,8 @@ class ServoStyleSet
    *
    * FIXME(emilio): Is there a point in this after bug 1367904?
    */
-  already_AddRefed<ComputedStyle> ResolveServoStyle(dom::Element* aElement)
-  {
-    return Servo_ResolveStyle(aElement, mRawSet.get()).Consume();
-  }
+  inline already_AddRefed<ComputedStyle>
+    ResolveServoStyle(dom::Element* aElement);
 
   bool GetKeyframesForName(nsAtom* aName,
                            const nsTimingFunction& aTimingFunction,

layout/style/ServoStyleSetInlines.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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_ServoStyleSetInlines_h
+#define mozilla_ServoStyleSetInlines_h
+
+#include "mozilla/ServoStyleSet.h"
+#include "mozilla/ServoBindings.h"
+
+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();
+}
+
+#endif // mozilla_ServoStyleSetInlines_h

layout/style/moz.build

@@ -102,6 +102,7 @@ EXPORTS.mozilla += [
     'ServoSpecifiedValues.h',
     'ServoStyleRule.h',
     'ServoStyleSet.h',
+    'ServoStyleSetInlines.h',
     'ServoStyleSheet.h',
     'ServoSupportsRule.h',
     'ServoTraversalStatistics.h',