commit 834653bcf80a3879c4d80004469053f205d45b69
author Mike Reed <reed@google.com> Wed Dec 14 14:57:40 2016 -0500
committer Mike Reed <reed@google.com> Thu Dec 15 16:01:42 2016 -0500
tree a768a01b54602eb53cf014ede34b5fb9cdad1e89
parent 94b5c92a3580b657517846fe3d2782414e0b25d0

try to stop using exotic clipps

Change-Id: Id11d7744daa69c19fdc9b7723862b3d71ad21384

libs/hwui/utils/TestWindowContext.cpp

diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp
index 8b80d69..91efa30 100644
--- a/libs/hwui/utils/TestWindowContext.cpp
+++ b/libs/hwui/utils/TestWindowContext.cpp
@@ -89,11 +89,15 @@
         mProxy->setup(800.0f, 255 * 0.075f, 255 * 0.15f);
         mProxy->setLightCenter(lightVector);
         mCanvas.reset(new android::uirenderer::RecordingCanvas(mSize.width(), mSize.height()));
+
+        mCanvas->save(SaveFlags::MatrixClip);  // balanced in prepareToDraw()
     }
 
     SkCanvas* prepareToDraw() {
         //mCanvas->reset(mSize.width(), mSize.height());
-        mCanvas->clipRect(0, 0, mSize.width(), mSize.height(), SkClipOp::kReplace);
+        mCanvas->restore();  // balancing inital save in constructor
+        mCanvas->save(SaveFlags::MatrixClip);
+        mCanvas->clipRect(0, 0, mSize.width(), mSize.height(), SkClipOp::kIntersect);
         return mCanvas->asSkCanvas();
     }