diff options
author | John Reck <jreck@android.com> | 2012-08-02 11:45:33 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-02 11:45:34 -0700 |
commit | 47387cc7716048dcea1cc5f9bf37da65d38e10be (patch) | |
tree | 73501623beb5530b201f3bf78f5a685ba0919ca5 | |
parent | ceeb43093b8e721dfe6671d7da44c1d1fd6f6ed8 (diff) | |
parent | 68ca7b3168f78f2354bf15934857c1705f22025e (diff) | |
download | external_webkit-47387cc7716048dcea1cc5f9bf37da65d38e10be.zip external_webkit-47387cc7716048dcea1cc5f9bf37da65d38e10be.tar.gz external_webkit-47387cc7716048dcea1cc5f9bf37da65d38e10be.tar.bz2 |
Merge "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]); |