commit d8f904f256b82e48e9a85561eb96e15399b0b2d9
author Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
committer Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
tree 6f418fc8ec95ab0112a39adbd7fa3bfff0d2ca4d
parent 550780745fa28ae9a87d02331841ca5ce4f9c763

Revert "Merge six commits from master-skia to master"

This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989

libs/hwui/SkiaCanvas.cpp

diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index a8f8134..36633b5 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -194,13 +194,15 @@
 
 void SkiaCanvas::setBitmap(const SkBitmap& bitmap) {
     SkCanvas* newCanvas = new SkCanvas(bitmap);
+    SkASSERT(newCanvas);
 
     if (!bitmap.isNull()) {
         // Copy the canvas matrix & clip state.
         newCanvas->setMatrix(mCanvas->getTotalMatrix());
-
-        ClipCopier copier(newCanvas);
-        mCanvas->replayClips(&copier);
+        if (NULL != mCanvas->getDevice() && NULL != newCanvas->getDevice()) {
+            ClipCopier copier(newCanvas);
+            mCanvas->replayClips(&copier);
+        }
     }
 
     // unrefs the existing canvas
@@ -215,15 +217,15 @@
 // ----------------------------------------------------------------------------
 
 bool SkiaCanvas::isOpaque() {
-    return mCanvas->imageInfo().isOpaque();
+    return mCanvas->getDevice()->accessBitmap(false).isOpaque();
 }
 
 int SkiaCanvas::width() {
-    return mCanvas->imageInfo().width();
+    return mCanvas->getBaseLayerSize().width();
 }
 
 int SkiaCanvas::height() {
-    return mCanvas->imageInfo().height();
+    return mCanvas->getBaseLayerSize().height();
 }
 
 // ----------------------------------------------------------------------------
@@ -579,7 +581,7 @@
                             float dstRight, float dstBottom, const SkPaint* paint) {
     SkRect srcRect = SkRect::MakeLTRB(srcLeft, srcTop, srcRight, srcBottom);
     SkRect dstRect = SkRect::MakeLTRB(dstLeft, dstTop, dstRight, dstBottom);
-    mCanvas->drawBitmapRect(bitmap, srcRect, dstRect, paint);
+    mCanvas->drawBitmapRectToRect(bitmap, &srcRect, dstRect, paint);
 }
 
 void SkiaCanvas::drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,