diff options
author | John Reck <jreck@google.com> | 2011-11-07 23:25:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-07 23:25:15 +0000 |
commit | d7abaddf5e1d8a8e5caf8c2af18699d98be8b8bf (patch) | |
tree | 57a1657112eb5d7cd596050b52c3b3ab2f9bf8cf /Source/WebCore/platform/android | |
parent | 557336db0d2cffe6f0e9213da1cb34676a02f178 (diff) | |
parent | 82ccbd8ce95211b4b5afad6a653462fd3beb771b (diff) | |
download | external_webkit-d7abaddf5e1d8a8e5caf8c2af18699d98be8b8bf.zip external_webkit-d7abaddf5e1d8a8e5caf8c2af18699d98be8b8bf.tar.gz external_webkit-d7abaddf5e1d8a8e5caf8c2af18699d98be8b8bf.tar.bz2 |
am 82ccbd8c: Remove the global button lock
* commit '82ccbd8ce95211b4b5afad6a653462fd3beb771b':
Remove the global button lock
Diffstat (limited to 'Source/WebCore/platform/android')
-rw-r--r-- | Source/WebCore/platform/android/RenderThemeAndroid.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebCore/platform/android/RenderThemeAndroid.cpp b/Source/WebCore/platform/android/RenderThemeAndroid.cpp index 7ef814e..481ecbf 100644 --- a/Source/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/Source/WebCore/platform/android/RenderThemeAndroid.cpp @@ -234,17 +234,18 @@ bool RenderThemeAndroid::paintButton(RenderObject* obj, const PaintInfo& info, c // If it is a disabled button, simply paint it to the master picture. Node* node = obj->node(); Element* formControlElement = static_cast<Element*>(node); - if (formControlElement && !formControlElement->isEnabledFormControl()) { + if (formControlElement) { android::WebFrame* webFrame = getWebFrame(node); if (webFrame) { RenderSkinAndroid* skins = webFrame->renderSkins(); - if (skins) - skins->renderSkinButton()->draw(getCanvasFromInfo(info), rect, - RenderSkinAndroid::kDisabled); + if (skins) { + RenderSkinAndroid::State state = RenderSkinAndroid::kNormal; + if (!formControlElement->isEnabledFormControl()) + state = RenderSkinAndroid::kDisabled; + skins->renderSkinButton()->draw(getCanvasFromInfo(info), rect, state); + } } - } else - // Store all the important information in the platform context. - info.context->platformContext()->storeButtonInfo(node, rect); + } // We always return false so we do not request to be redrawn. return false; |