Remove stray log

Romain Guy · Romain Guy · commit ad1daaa87b79 · 2012-03-01T17:33:42.000-08:00
Change-Id: I0c1979aab395098651c8a63d0bae0198ebc3746b
diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp
@@ -599,7 +599,6 @@ bool DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flags, u
                 continue;
             } else {
                 op &= ~OP_MAY_BE_SKIPPED_MASK;
-                ALOGD("%s", OP_NAMES[op]);
             }
         }
         logBuffer.writeCommand(level, op);
diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
@@ -391,8 +391,9 @@ class DisplayListRenderer: public OpenGLRenderer {
         mHasDrawOps = mHasDrawOps || drawOp >= DisplayList::DrawDisplayList;
         if (reject) {
             mWriter.writeInt(OP_MAY_BE_SKIPPED_MASK | drawOp);
-            mWriter.writeInt(0);
-            uint32_t* location = reject ? mWriter.peek32(mWriter.size() - 4) : NULL;
+            mWriter.writeInt(0xdeaddead);
+            uint32_t* location = reject ?
+                    mWriter.peek32(mWriter.size() - sizeof(int32_t)) : NULL;
             return location;
         }
         mWriter.writeInt(drawOp);
@@ -401,7 +402,8 @@ class DisplayListRenderer: public OpenGLRenderer {
 
     inline void addSkip(uint32_t* location) {
         if (location) {
-            *location = (int32_t) (mWriter.peek32(mWriter.size() - 4) - location);
+            *location = (int32_t) (mWriter.peek32(
+                    mWriter.size() - sizeof(int32_t)) - location);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,6 @@ bool DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flags, u`
`599`	`599`	`continue;`
`600`	`600`	`} else {`
`601`	`601`	`op &= ~OP_MAY_BE_SKIPPED_MASK;`
`602`		`- ALOGD("%s", OP_NAMES[op]);`
`603`	`602`	`}`
`604`	`603`	`}`
`605`	`604`	`logBuffer.writeCommand(level, op);`
Original file line number	Diff line number	Diff line change
`@@ -391,8 +391,9 @@ class DisplayListRenderer: public OpenGLRenderer {`
`391`	`391`	`mHasDrawOps = mHasDrawOps \|\| drawOp >= DisplayList::DrawDisplayList;`
`392`	`392`	`if (reject) {`
`393`	`393`	`mWriter.writeInt(OP_MAY_BE_SKIPPED_MASK \| drawOp);`
`394`		`- mWriter.writeInt(0);`
`395`		`- uint32_t* location = reject ? mWriter.peek32(mWriter.size() - 4) : NULL;`
	`394`	`+ mWriter.writeInt(0xdeaddead);`
	`395`	`+ uint32_t* location = reject ?`
	`396`	`+ mWriter.peek32(mWriter.size() - sizeof(int32_t)) : NULL;`
`396`	`397`	`return location;`
`397`	`398`	`}`
`398`	`399`	`mWriter.writeInt(drawOp);`
`@@ -401,7 +402,8 @@ class DisplayListRenderer: public OpenGLRenderer {`
`401`	`402`
`402`	`403`	`inline void addSkip(uint32_t* location) {`
`403`	`404`	`if (location) {`
`404`		`- *location = (int32_t) (mWriter.peek32(mWriter.size() - 4) - location);`
	`405`	`+ *location = (int32_t) (mWriter.peek32(`
	`406`	`+ mWriter.size() - sizeof(int32_t)) - location);`
`405`	`407`	`}`
`406`	`408`	`}`
`407`	`409`