--- a/gfx/layers/client/ContentClient.cpp
+++ b/gfx/layers/client/ContentClient.cpp
@@ -251,17 +251,17 @@ ContentClient::BeginPaint(PaintedLayer* 
   return result;
 }
 
 DrawTarget*
 ContentClient::BorrowDrawTargetForPainting(ContentClient::PaintState& aPaintState,
                                            RotatedBuffer::DrawIterator* aIter /* = nullptr */)
 {
   RefPtr<CapturedPaintState> capturedState =
-    BorrowDrawTargetForRecording(aPaintState, aIter, true);
+    ContentClient::BorrowDrawTargetForRecording(aPaintState, aIter, true);
 
   if (!capturedState) {
     return nullptr;
   }
 
   if (!ContentClient::PrepareDrawTargetForPainting(capturedState)) {
     return nullptr;
   }
@@ -290,18 +290,17 @@ ExpandDrawRegion(ContentClient::PaintSta
   return *drawPtr;
 }
 
 RefPtr<CapturedPaintState>
 ContentClient::BorrowDrawTargetForRecording(ContentClient::PaintState& aPaintState,
                                             RotatedBuffer::DrawIterator* aIter,
                                             bool aSetTransform)
 {
-  if (aPaintState.mMode == SurfaceMode::SURFACE_NONE ||
-      !mBuffer || !mBuffer->IsLocked()) {
+  if (aPaintState.mMode == SurfaceMode::SURFACE_NONE || !mBuffer) {
     return nullptr;
   }
 
   Matrix transform;
   DrawTarget* result = mBuffer->BorrowDrawTargetForQuadrantUpdate(
                                   aPaintState.mRegionToDraw.GetBounds(),
                                   RotatedBuffer::BUFFER_BOTH, aIter,
                                   aSetTransform,