Refugee from Dead Machine 4: MDB Monster

src/gpu/effects/GrTextureStripAtlas.cpp

Index: src/gpu/effects/GrTextureStripAtlas.cpp
diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp
index f2133d12f2bf283b9fd8c033a7db347b8c5e8b1c..c7cb49dd8eb99765c0bbaf36a82a08298caeec96 100644
--- a/src/gpu/effects/GrTextureStripAtlas.cpp
+++ b/src/gpu/effects/GrTextureStripAtlas.cpp
@@ -157,7 +157,7 @@ int GrTextureStripAtlas::lockRow(const SkBitmap& data) {
 
         // Pass in the kDontFlush flag, since we know we're writing to a part of this texture
         // that is not currently in use
-        fTexture->writePixels(0,  rowNumber * fDesc.fRowHeight,
+        fTexture->writePixels(NULL, 0,  rowNumber * fDesc.fRowHeight,
                               fDesc.fWidth, fDesc.fRowHeight,
                               SkImageInfo2GrPixelConfig(data.info()),
                               data.getPixels(),
@@ -209,6 +209,7 @@ void GrTextureStripAtlas::lockTexture() {
             return;
         }
         fDesc.fContext->textureProvider()->assignUniqueKeyToTexture(key, fTexture);
+        fTexture->setFromRawPixels(true);
         // This is a new texture, so all of our cache info is now invalid
         this->initLRU();
         fKeyTable.rewind();