Bug 1382200 - Eliminate LayerMetricsWrapper::IsScrollInfoLayer entirely by inlining it. r=botond

MozReview-Commit-ID: KX35cjOAQw7

--HG--
extra : rebase_source : 2e451ce0250ec17fc7f1a642e5a8a341c073105d

gfx/layers/LayerMetricsWrapper.h

@@ -174,13 +174,6 @@ public:
     return IsValid();
   }
 
-  bool IsScrollInfoLayer() const
-  {
-    MOZ_ASSERT(IsValid());
-
-    return Metrics().IsScrollInfoLayer();
-  }
-
   LayerMetricsWrapper GetParent() const
   {
     MOZ_ASSERT(IsValid());

gfx/layers/apz/src/APZCTreeManager.cpp

@@ -583,7 +583,7 @@ APZCTreeManager::PrintAPZCInfo(const ScrollNode& aLayer,
   mApzcTreeLog << "APZC " << apzc->GetGuid()
                << "\tcb=" << metrics.GetCompositionBounds()
                << "\tsr=" << metrics.GetScrollableRect()
-               << (aLayer.IsScrollInfoLayer() ? "\tscrollinfo" : "")
+               << (metrics.IsScrollInfoLayer() ? "\tscrollinfo" : "")
                << (apzc->HasScrollgrab() ? "\tscrollgrab" : "") << "\t"
                << aLayer.Metadata().GetContentDescription().get();
 }
@@ -607,7 +607,7 @@ APZCTreeManager::AttachNodeToTree(HitTestingTreeNode* aNode,
 template<class ScrollNode> static EventRegions
 GetEventRegions(const ScrollNode& aLayer)
 {
-  if (aLayer.IsScrollInfoLayer()) {
+  if (aLayer.Metrics().IsScrollInfoLayer()) {
     ParentLayerIntRect compositionBounds(RoundedToInt(aLayer.Metrics().GetCompositionBounds()));
     nsIntRegion hitRegion(compositionBounds.ToUnknownRect());
     EventRegions eventRegions(hitRegion);

gfx/layers/composite/AsyncCompositionManager.cpp

@@ -1100,7 +1100,7 @@ LayerIsScrollbarTarget(const LayerMetricsWrapper& aTarget, Layer* aScrollbar)
   if (metrics.GetScrollId() != aScrollbar->GetScrollbarTargetContainerId()) {
     return false;
   }
-  return !aTarget.IsScrollInfoLayer();
+  return !metrics.IsScrollInfoLayer();
 }
 
 static void

gfx/layers/wr/WebRenderScrollDataWrapper.h

@@ -125,13 +125,6 @@ public:
     return IsValid();
   }
 
-  bool IsScrollInfoLayer() const
-  {
-    MOZ_ASSERT(IsValid());
-
-    return Metrics().IsScrollInfoLayer();
-  }
-
   WebRenderScrollDataWrapper GetLastChild() const
   {
     MOZ_ASSERT(IsValid());