Bug 1368551 - Remove unneccessary overload of PushStackingContext. r?pchang draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 31 May 2017 16:18:29 -0400
changeset 587267 0d3410a80a6eff2133db024faf2e53bbc3805911
parent 587211 cf6ba2cbdea2b042d59c5d0c2817116320ac0352
child 587268 8b8f3f753d890780825b3347aa2a546a2e9d02f4
push id61672
push userkgupta@mozilla.com
push dateWed, 31 May 2017 20:18:49 +0000
reviewerspchang
bugs1368551
milestone55.0a1
Bug 1368551 - Remove unneccessary overload of PushStackingContext. r?pchang This overload is only called in one place, so we can just inline it. It makes the API a little simpler. MozReview-Commit-ID: KNsJHYSHZcT
gfx/layers/wr/StackingContextHelper.cpp
gfx/webrender_bindings/WebRenderAPI.cpp
gfx/webrender_bindings/WebRenderAPI.h
--- a/gfx/layers/wr/StackingContextHelper.cpp
+++ b/gfx/layers/wr/StackingContextHelper.cpp
@@ -21,19 +21,18 @@ StackingContextHelper::StackingContextHe
                                              wr::DisplayListBuilder& aBuilder,
                                              WebRenderLayer* aLayer,
                                              const Maybe<gfx::Matrix4x4>& aTransform)
   : mBuilder(&aBuilder)
 {
   WrRect scBounds = aParentSC.ToRelativeWrRect(aLayer->BoundsForStackingContext());
   Layer* layer = aLayer->GetLayer();
   mTransform = aTransform.valueOr(layer->GetTransform());
-  mBuilder->PushStackingContext(scBounds,
-                                1.0f,
-                                mTransform,
+  float opacity = 1.0f;
+  mBuilder->PushStackingContext(scBounds, 0, &opacity, &mTransform,
                                 wr::ToWrMixBlendMode(layer->GetMixBlendMode()));
   mOrigin = aLayer->Bounds().TopLeft();
 }
 
 StackingContextHelper::StackingContextHelper(const StackingContextHelper& aParentSC,
                                              wr::DisplayListBuilder& aBuilder,
                                              WebRenderLayer* aLayer,
                                              uint64_t aAnimationsId,
--- a/gfx/webrender_bindings/WebRenderAPI.cpp
+++ b/gfx/webrender_bindings/WebRenderAPI.cpp
@@ -564,26 +564,16 @@ DisplayListBuilder::PushStackingContext(
   const WrMatrix* maybeTransform = aTransform ? &matrix : nullptr;
   WRDL_LOG("PushStackingContext b=%s t=%s\n", Stringify(aBounds).c_str(),
       aTransform ? Stringify(*aTransform).c_str() : "none");
   wr_dp_push_stacking_context(mWrState, aBounds, aAnimationId, aOpacity,
                               maybeTransform, aMixBlendMode);
 }
 
 void
-DisplayListBuilder::PushStackingContext(const WrRect& aBounds,
-                                        const float aOpacity,
-                                        const gfx::Matrix4x4& aTransform,
-                                        const WrMixBlendMode& aMixBlendMode)
-{
-  PushStackingContext(aBounds, 0, &aOpacity,
-                      &aTransform, aMixBlendMode);
-}
-
-void
 DisplayListBuilder::PopStackingContext()
 {
   WRDL_LOG("PopStackingContext\n");
   wr_dp_pop_stacking_context(mWrState);
 }
 
 void
 DisplayListBuilder::PushClip(const WrRect& aClipRect,
--- a/gfx/webrender_bindings/WebRenderAPI.h
+++ b/gfx/webrender_bindings/WebRenderAPI.h
@@ -140,21 +140,16 @@ public:
 
   void Begin(const LayerIntSize& aSize);
 
   void End();
   void Finalize(WrSize& aOutContentSize,
                 wr::BuiltDisplayList& aOutDisplayList);
 
   void PushStackingContext(const WrRect& aBounds, // TODO: We should work with strongly typed rects
-                           const float aOpacity,
-                           const gfx::Matrix4x4& aTransform,
-                           const WrMixBlendMode& aMixBlendMode);
-
-  void PushStackingContext(const WrRect& aBounds, // TODO: We should work with strongly typed rects
                            const uint64_t& aAnimationId,
                            const float* aOpacity,
                            const gfx::Matrix4x4* aTransform,
                            const WrMixBlendMode& aMixBlendMode);
   void PopStackingContext();
 
   void PushClip(const WrRect& aClipRect,
                 const WrImageMask* aMask);