diff options
| author | Derek Sollenberger <djsollen@google.com> | 2013-01-30 14:32:29 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2013-01-30 14:32:29 -0500 |
| commit | 2dbd185fd0e5dfe9addb677f42716c442b7e62bd (patch) | |
| tree | 6aac1ed40b80d003c8d5d6469d21092cd26d7141 /core | |
| parent | 1de9023190691b44df0f45eaaf501ced6177ca09 (diff) | |
| parent | c93c6aa5553203f05df871804517885fcc071cfd (diff) | |
| download | frameworks_base-2dbd185fd0e5dfe9addb677f42716c442b7e62bd.zip frameworks_base-2dbd185fd0e5dfe9addb677f42716c442b7e62bd.tar.gz frameworks_base-2dbd185fd0e5dfe9addb677f42716c442b7e62bd.tar.bz2 | |
resolved conflicts for merge of c93c6aa5 to master-chromium
Change-Id: I51429ed5359355025f873ccab11bfabbbe772a46
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 2 | ||||
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 2b4260d..5e6125f 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -1868,7 +1868,7 @@ public abstract class HardwareRenderer { mDebugDataProvider.setupGraphPaint(mProfilePaint, i); switch (graphType) { case GraphDataProvider.GRAPH_TYPE_BARS: - mGlCanvas.drawRects(mProfileShapes[i], count, mProfilePaint); + mGlCanvas.drawRects(mProfileShapes[i], count * 4, mProfilePaint); break; case GraphDataProvider.GRAPH_TYPE_LINES: mGlCanvas.drawLines(mProfileShapes[i], 0, count * 4, mProfilePaint); diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 85d2905..e800e72 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -478,7 +478,7 @@ static void android_view_GLES20Canvas_drawRegionAsRects(JNIEnv* env, jobject cla rects.push(r.fTop); rects.push(r.fRight); rects.push(r.fBottom); - count++; + count += 4; it.next(); } renderer->drawRects(rects.array(), count, paint); |