commit 5af5fc50c2f43fc0e0813e02cb6a950901a9c0b8
author Chris Craik <ccraik@google.com> Fri Sep 13 14:41:31 2013 -0700
committer Chris Craik <ccraik@google.com> Fri Sep 13 14:44:08 2013 -0700
tree 221c3597a772b71ffc68a3cc6b8f0076f2e4ed9e
parent 9210bc85545f31973c957b5179e6a82d05f473c6

Fix merged operation clipping

bug:10745870

Missing 'const' meant MergingDrawBatch would never clip anything.

Change-Id: Ia6367eff94cf5f437efafbc3ba7f0da102ffd956

libs/hwui/DeferredDisplayList.cpp

diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp
index fd9257a..c0b77c7 100644
--- a/libs/hwui/DeferredDisplayList.cpp
+++ b/libs/hwui/DeferredDisplayList.cpp
@@ -249,7 +249,7 @@
         return true;
     }
 
-    virtual void add(DrawOp* op, DeferredDisplayState* state, bool opaqueOverBounds) {
+    virtual void add(DrawOp* op, const DeferredDisplayState* state, bool opaqueOverBounds) {
         DrawBatch::add(op, state, opaqueOverBounds);
 
         const int newClipSideFlags = state->mClipSideFlags;