Bug 1339625 - Unlock textures before calling updated r=kats

gfx/layers/wr/WebRenderPaintedLayer.cpp

@@ -18,11 +18,13 @@ namespace layers {
 using namespace mozilla::gfx;
 
 void
-WebRenderPaintedLayer::PaintThebes()
+WebRenderPaintedLayer::PaintThebes(nsTArray<ReadbackProcessor::Update>* aReadbackUpdates)
 {
   PROFILER_LABEL("WebRenderPaintedLayer", "PaintThebes",
     js::ProfileEntry::Category::GRAPHICS);
 
+  mContentClient->BeginPaint();
+
   uint32_t flags = RotatedContentBuffer::PAINT_CAN_DRAW_ROTATED;
 
   PaintState state =
@@ -66,6 +68,9 @@ WebRenderPaintedLayer::PaintThebes()
     mContentClient->ReturnDrawTargetToBuffer(target);
     didUpdate = true;
   }
+
+  mContentClient->EndPaint(aReadbackUpdates);
+
   if (didUpdate) {
     Mutated();
 
@@ -100,10 +105,7 @@ WebRenderPaintedLayer::RenderLayerWithReadback(ReadbackProcessor *aReadback)
     aReadback->GetPaintedLayerUpdates(this, &readbackUpdates);
   }
 
-  IntPoint origin(mVisibleRegion.GetBounds().x, mVisibleRegion.GetBounds().y);
-  mContentClient->BeginPaint();
-  PaintThebes();
-  mContentClient->EndPaint(&readbackUpdates);
+  PaintThebes(&readbackUpdates);
 }
 
 void

gfx/layers/wr/WebRenderPaintedLayer.h

@@ -52,7 +52,7 @@ public:
 
   Layer* GetLayer() override { return this; }
   void RenderLayer() override;
-  void PaintThebes();
+  void PaintThebes(nsTArray<ReadbackProcessor::Update>* aReadbackUpdates);
   void RenderLayerWithReadback(ReadbackProcessor *aReadback);
   RefPtr<ContentClient> mContentClient;
 };