diff options
| -rw-r--r-- | Source/WebCore/html/HTMLInputElement.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp index 4ede2a8..27b29a8 100644 --- a/Source/WebCore/html/HTMLInputElement.cpp +++ b/Source/WebCore/html/HTMLInputElement.cpp @@ -1569,7 +1569,11 @@ bool HTMLInputElement::hasSpinButton() const bool HTMLInputElement::supportsPlaceholder() const { +#if PLATFORM(ANDROID) + return isTextType() || isNumberField(); +#else return isTextType(); +#endif } CheckedRadioButtons& HTMLInputElement::checkedRadioButtons() const 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]); |