diff options
author | John Reck <jreck@android.com> | 2012-08-02 14:59:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 14:59:31 -0700 |
commit | dd5962d2534b8c3cc215492c8dcf463e923f73c2 (patch) | |
tree | fa1870069ef035ca114dd1fc6fcc26008afe0481 | |
parent | a49c3d2489a8eb888a969b9a06a64b805c9c37ae (diff) | |
parent | 47387cc7716048dcea1cc5f9bf37da65d38e10be (diff) | |
download | external_webkit-dd5962d2534b8c3cc215492c8dcf463e923f73c2.zip external_webkit-dd5962d2534b8c3cc215492c8dcf463e923f73c2.tar.gz external_webkit-dd5962d2534b8c3cc215492c8dcf463e923f73c2.tar.bz2 |
am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are rendered black"
* commit '47387cc7716048dcea1cc5f9bf37da65d38e10be':
Fix browser rendering issue: pure color tiles are rendered black
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp index bfa0789..4a0b77b 100644 --- a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp @@ -409,7 +409,7 @@ bool GLUtils::isPureColorBitmap(const SkBitmap& bitmap, Color& pureColor) pixelsRow = 0; if (sameColor) { - char* rgbaPtr = static_cast<char*>(bitmap.getPixels()); + unsigned char* rgbaPtr = static_cast<unsigned char*>(bitmap.getPixels()); pureColor = Color(rgbaPtr[0], rgbaPtr[1], rgbaPtr[2], rgbaPtr[3]); ALOGV("sameColor tile found , %x at (%d, %d, %d, %d)", *firstPixelPtr, rgbaPtr[0], rgbaPtr[1], rgbaPtr[2], rgbaPtr[3]); |