commit 8a4ac610e1aaf04931ac1af54b146a7fc8e66114
author Romain Guy <romainguy@google.com> Tue Jul 17 17:32:48 2012 -0700
committer Romain Guy <romainguy@google.com> Tue Jul 17 17:32:48 2012 -0700
tree 72a29e07d41dbf1e85966ec70acba688a93ec90c
parent 41a48e4a9984eff92705a0c52104b0abd365521a

Don't clear the dirty clip flag if it's not applied
Bug #6833979

Change-Id: I0ea78b7f31a557a335de10d910d03b0520029080

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 56eb317..258ced0 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -358,7 +358,7 @@
     }
 }
 
-void Caches::setScissor(GLint x, GLint y, GLint width, GLint height) {
+bool Caches::setScissor(GLint x, GLint y, GLint width, GLint height) {
     if (scissorEnabled && (x != mScissorX || y != mScissorY ||
             width != mScissorWidth || height != mScissorHeight)) {
 
@@ -368,21 +368,28 @@
         mScissorY = y;
         mScissorWidth = width;
         mScissorHeight = height;
+
+        return true;
     }
+    return false;
 }
 
-void Caches::enableScissor() {
+bool Caches::enableScissor() {
     if (!scissorEnabled) {
         glEnable(GL_SCISSOR_TEST);
         scissorEnabled = true;
+        return true;
     }
+    return false;
 }
 
-void Caches::disableScissor() {
+bool Caches::disableScissor() {
     if (scissorEnabled) {
         glDisable(GL_SCISSOR_TEST);
         scissorEnabled = false;
+        return true;
     }
+    return false;
 }
 
 void Caches::setScissorEnabled(bool enabled) {