diff options
| author | Chris Craik <ccraik@google.com> | 2013-09-13 17:22:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-13 17:22:27 -0700 |
| commit | bb451bda4a08f79b60f84242647bdb40962f01b5 (patch) | |
| tree | eafc737c5d0b595097c5e0b87235cbeda1545ba6 | |
| parent | 5de041193cec58e8ee40a62c760b24141455b2f8 (diff) | |
| parent | 0d3c52d3afc1e3ea4ae2ea63355388a095ebeb4c (diff) | |
| download | frameworks_base-bb451bda4a08f79b60f84242647bdb40962f01b5.zip frameworks_base-bb451bda4a08f79b60f84242647bdb40962f01b5.tar.gz frameworks_base-bb451bda4a08f79b60f84242647bdb40962f01b5.tar.bz2 | |
am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev
* commit '0d3c52d3afc1e3ea4ae2ea63355388a095ebeb4c':
Fix merged operation clipping
| -rw-r--r-- | libs/hwui/DeferredDisplayList.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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; |