Bug 1285619 - Call ResetLayerStateForRecycling() when recycling an OwnLayer. r=mstange, a=gchang
authorBotond Ballo <botond@mozilla.com>
Fri, 08 Jul 2016 17:24:48 -0400
changeset 340177 76fafe444a3726398034b5aed84a771a05f593d9
parent 340176 bd518331a09d74610f37699fe3600a4aa47c1373
child 340178 c5fdc568bd3b213a3b03636aa6ca400cfd8cfd99
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange, gchang
bugs1285619
milestone49.0a2
Bug 1285619 - Call ResetLayerStateForRecycling() when recycling an OwnLayer. r=mstange, a=gchang MozReview-Commit-ID: 66J6wBcrYDQ
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -5388,17 +5388,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));