diff options
| author | John Reck <jreck@android.com> | 2012-08-02 15:40:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 15:40:07 -0700 |
| commit | 6228f1617d7525d64a23edd3b497791c6a06e842 (patch) | |
| tree | d47ff0de479b5d630feea85d40d97acdbc9994e9 /Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp | |
| parent | 3fe9241dc0b20c68b75847832b8f179c741f4b34 (diff) | |
| parent | dd5962d2534b8c3cc215492c8dcf463e923f73c2 (diff) | |
| download | external_webkit-6228f1617d7525d64a23edd3b497791c6a06e842.zip external_webkit-6228f1617d7525d64a23edd3b497791c6a06e842.tar.gz external_webkit-6228f1617d7525d64a23edd3b497791c6a06e842.tar.bz2 | |
am dd5962d2: am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are rendered black"
* commit 'dd5962d2534b8c3cc215492c8dcf463e923f73c2':
Fix browser rendering issue: pure color tiles are rendered black
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp')
| -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 d5a701b..1a54cb7 100644 --- a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp @@ -410,7 +410,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]); |