commit 5e00c7ce063116c11315639f0035aca8ad73e8cc
author Chris Craik <ccraik@google.com> Wed Jul 06 16:10:09 2016 -0700
committer Chris Craik <ccraik@google.com> Thu Jul 07 15:53:50 2016 -0700
tree 6ca43728a401d92762fb5fd65cfd39afe9438571
parent 32d9ae186733115802eafe241c2029a63794efc2

Delete old rendering pipeline

fixes: 30002246

Change-Id: I45df0e924708526cee045b14c291bd23aa1a92db

libs/hwui/CanvasState.cpp

diff --git a/libs/hwui/CanvasState.cpp b/libs/hwui/CanvasState.cpp
index e2149d1..7e2c28c 100644
--- a/libs/hwui/CanvasState.cpp
+++ b/libs/hwui/CanvasState.cpp
@@ -23,8 +23,7 @@
 
 
 CanvasState::CanvasState(CanvasStateClient& renderer)
-        : mDirtyClip(false)
-        , mWidth(-1)
+        : mWidth(-1)
         , mHeight(-1)
         , mSaveCount(1)
         , mCanvas(renderer)
@@ -205,19 +204,16 @@
 
 bool CanvasState::clipRect(float left, float top, float right, float bottom, SkRegion::Op op) {
     mSnapshot->clip(Rect(left, top, right, bottom), op);
-    mDirtyClip = true;
     return !mSnapshot->clipIsEmpty();
 }
 
 bool CanvasState::clipPath(const SkPath* path, SkRegion::Op op) {
     mSnapshot->clipPath(*path, op);
-    mDirtyClip = true;
     return !mSnapshot->clipIsEmpty();
 }
 
 bool CanvasState::clipRegion(const SkRegion* region, SkRegion::Op op) {
     mSnapshot->clipRegionTransformed(*region, op);
-    mDirtyClip = true;
     return !mSnapshot->clipIsEmpty();
 }
 
@@ -236,15 +232,6 @@
     }
 }
 
-void CanvasState::setClippingRoundRect(LinearAllocator& allocator,
-        const Rect& rect, float radius, bool highPriority) {
-    mSnapshot->setClippingRoundRect(allocator, rect, radius, highPriority);
-}
-
-void CanvasState::setProjectionPathMask(LinearAllocator& allocator, const SkPath* path) {
-    mSnapshot->setProjectionPathMask(allocator, path);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Quick Rejection
 ///////////////////////////////////////////////////////////////////////////////
@@ -263,7 +250,7 @@
         float right, float bottom,
         bool* clipRequired, bool* roundRectClipRequired,
         bool snapOut) const {
-    if (mSnapshot->isIgnored() || bottom <= top || right <= left) {
+    if (bottom <= top || right <= left) {
         return true;
     }
 
@@ -291,7 +278,7 @@
 
 bool CanvasState::quickRejectConservative(float left, float top,
         float right, float bottom) const {
-    if (mSnapshot->isIgnored() || bottom <= top || right <= left) {
+    if (bottom <= top || right <= left) {
         return true;
     }