am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev

* commit 'bb451bda4a08f79b60f84242647bdb40962f01b5': Fix merged operation clipping
2013-09-13 17:32:06 -07:00
parent c083cb719a bb451bda4a
commit d3979bc5a7
1 changed files with 1 additions and 1 deletions
--- a/libs/hwui/DeferredDisplayList.cpp
+++ b/libs/hwui/DeferredDisplayList.cpp
@@ -249,7 +249,7 @@ public:
        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;