Bug 1285619 - Call ResetLayerStateForRecycling() when recycling an OwnLayer. r=mstange
authorBotond Ballo <botond@mozilla.com>
Fri, 08 Jul 2016 17:24:48 -0400
changeset 348625 2fb6c80879610223cd5a8e3e5f75a841119c6097
parent 348624 b64e32f1ceeee40be0bf2a1c197ae302dcdd065d
child 348626 f4b95c6cfe5f2f425eacfcae7b430f8e24f13216
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1285619
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1285619 - Call ResetLayerStateForRecycling() when recycling an OwnLayer. r=mstange MozReview-Commit-ID: 66J6wBcrYDQ
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -5419,17 +5419,17 @@ FrameLayerBuilder::GetLeafLayerFor(nsDis
   if (!layer)
     return nullptr;
   if (layer->HasUserData(&gPaintedDisplayItemLayerUserData)) {
     // This layer was created to render Thebes-rendered content for this
     // display item. The display item should not use it for its own
     // layer rendering.
     return nullptr;
   }
-  layer->SetMaskLayer(nullptr);
+  ResetLayerStateForRecycling(layer);
   return layer;
 }
 
 /* static */ void
 FrameLayerBuilder::InvalidateAllLayers(LayerManager* aManager)
 {
   LayerManagerData* data = static_cast<LayerManagerData*>
     (aManager->GetUserData(&gLayerManagerUserData));