Bug 1335799 - Disable now-incorrect WrScrollFrameStackingContextGenerator code. r=kats
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Tue, 14 Feb 2017 13:34:15 -0500
changeset 372990 ca2b6dc909b31499974dc17041ce96181579206f
parent 372989 47611a305c4407c98064008592d0df04400acc3b
child 372991 5b1a780d4aa94e4e0e5e2d8a70127d037da2848c
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1335799
milestone54.0a1
Bug 1335799 - Disable now-incorrect WrScrollFrameStackingContextGenerator code. r=kats MozReview-Commit-ID: DdfOtYkrZWZ
gfx/layers/wr/WebRenderLayerManager.cpp
--- a/gfx/layers/wr/WebRenderLayerManager.cpp
+++ b/gfx/layers/wr/WebRenderLayerManager.cpp
@@ -152,38 +152,34 @@ WrScrollFrameStackingContextGenerator::W
     // the available overflow. If we didn't do this and WR did bounds checking
     // on the scroll offset, we'd fail those checks.
     overflow.MoveBy(bounds.x - scrollPos.x, bounds.y - scrollPos.y);
     if (gfxPrefs::LayersDump()) {
       printf_stderr("Pushing stacking context id %" PRIu64 " with bounds=%s, overflow=%s\n",
         fm.GetScrollId(), Stringify(bounds).c_str(), Stringify(overflow).c_str());
     }
 
-    mLayer->WrBridge()->AddWebRenderCommand(
-      OpDPPushStackingContext(wr::ToWrRect(bounds),
-                              wr::ToWrRect(overflow),
-                              Nothing(),
-                              1.0f,
-                              layer->GetAnimations(),
-                              identity,
-                              WrMixBlendMode::Normal,
-                              fm.GetScrollId()));
+/*    mLayer->WrBridge()->AddWebRenderCommand(
+      OpDPPushScrollLayer(wr::ToWrRect(bounds),
+                          wr::ToWrRect(overflow),
+                          Nothing(),
+                          fm.GetScrollId()));*/
   }
 }
 
 WrScrollFrameStackingContextGenerator::~WrScrollFrameStackingContextGenerator()
 {
   Layer* layer = mLayer->GetLayer();
   for (size_t i = 0; i < layer->GetScrollMetadataCount(); i++) {
     const FrameMetrics& fm = layer->GetFrameMetrics(i);
     if (!fm.IsScrollable()) {
       continue;
     }
     if (gfxPrefs::LayersDump()) printf_stderr("Popping stacking context id %" PRIu64"\n", fm.GetScrollId());
-    mLayer->WrBridge()->AddWebRenderCommand(OpDPPopStackingContext());
+//    mLayer->WrBridge()->AddWebRenderCommand(OpDPPopStackingContext());
   }
 }
 
 
 WebRenderLayerManager::WebRenderLayerManager(nsIWidget* aWidget)
   : mWidget(aWidget)
   , mLatestTransactionId(0)
   , mTarget(nullptr)