commit 5216c3b05fc6c7bacd74be67b932fe3aba89cc8e
author Romain Guy <romainguy@google.com> Fri Jun 14 16:31:37 2013 -0700
committer Romain Guy <romainguy@google.com> Fri Jun 14 16:31:37 2013 -0700
tree 30cbaba31df888eb0ecd10561cf0e8c707c4c34a
parent 756a53f4e4dc8671287d7a192c619e0e1c627ebd

Merge more 9patches

Change-Id: If8b16af84f0ee42afc406922d15897e51d833e68

libs/hwui/DisplayListOp.h

diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
index 470cdda..290e4fa 100644
--- a/libs/hwui/DisplayListOp.h
+++ b/libs/hwui/DisplayListOp.h
@@ -33,7 +33,7 @@
 #include "utils/LinearAllocator.h"
 
 #define CRASH() do { \
-    *(int *)(uintptr_t)0xbbadbeef = 0; \
+    *(int *)(uintptr_t) 0xbbadbeef = 0; \
     ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
 } while(false)
 
@@ -947,10 +947,9 @@
 
     virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo) {
         deferInfo.batchId = DeferredDisplayList::kOpBatch_Patch;
-        deferInfo.mergeId = (mergeid_t) mBitmap;
+        deferInfo.mergeId = mEntry ? (mergeid_t) &mEntry->atlas : (mergeid_t) mBitmap;
         deferInfo.mergeable = true;
-        deferInfo.opaqueOverBounds = isOpaqueOverBounds() &&
-                mBitmap->isOpaque();
+        deferInfo.opaqueOverBounds = isOpaqueOverBounds() && mBitmap->isOpaque();
     }
 
 private: