From db66e58ecc3c8452fda5c100f8dd4b48023a1eac Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Wed, 19 Sep 2018 15:31:09 -0400
Subject: [PATCH] Bug 1489632 - mark Skia bitmap layer as immutable before
 popping it. r=rhunt

---
 gfx/skia/skia/src/core/SkBitmapDevice.h | 1 +
 gfx/skia/skia/src/core/SkCanvas.cpp     | 1 +
 gfx/skia/skia/src/core/SkDevice.h       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/gfx/skia/skia/src/core/SkBitmapDevice.h b/gfx/skia/skia/src/core/SkBitmapDevice.h
index b102ebe62b83..7a09b9d827f6 100644
--- a/gfx/skia/skia/src/core/SkBitmapDevice.h
+++ b/gfx/skia/skia/src/core/SkBitmapDevice.h
@@ -119,6 +119,7 @@ protected:
     sk_sp<SkSpecialImage> makeSpecial(const SkBitmap&) override;
     sk_sp<SkSpecialImage> makeSpecial(const SkImage*) override;
     sk_sp<SkSpecialImage> snapSpecial() override;
+    void setImmutable() override { fBitmap.setImmutable(); }
 
     ///////////////////////////////////////////////////////////////////////////
 
diff --git a/gfx/skia/skia/src/core/SkCanvas.cpp b/gfx/skia/skia/src/core/SkCanvas.cpp
index 5738c83dd214..82457c6a2440 100644
--- a/gfx/skia/skia/src/core/SkCanvas.cpp
+++ b/gfx/skia/skia/src/core/SkCanvas.cpp
@@ -1195,6 +1195,7 @@ void SkCanvas::internalRestore() {
     if (layer) {
         if (fMCRec) {
             const SkIPoint& origin = layer->fDevice->getOrigin();
+            layer->fDevice->setImmutable();
             this->internalDrawDevice(layer->fDevice.get(), origin.x(), origin.y(),
                                      layer->fPaint.get(),
                                      layer->fClipImage.get(), layer->fClipMatrix);
diff --git a/gfx/skia/skia/src/core/SkDevice.h b/gfx/skia/skia/src/core/SkDevice.h
index 18fd5d13a710..885750b1c865 100644
--- a/gfx/skia/skia/src/core/SkDevice.h
+++ b/gfx/skia/skia/src/core/SkDevice.h
@@ -271,6 +271,7 @@ protected:
     virtual sk_sp<SkSpecialImage> makeSpecial(const SkBitmap&);
     virtual sk_sp<SkSpecialImage> makeSpecial(const SkImage*);
     virtual sk_sp<SkSpecialImage> snapSpecial();
+    virtual void setImmutable() {}
 
     bool readPixels(const SkPixmap&, int x, int y);