Merge change 5216

* changes:
  Make buttons draw their state properly.

1 files changed, 6 insertions, 5 deletions

diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index 0efe972..09b679d 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -204,13 +204,14 @@ bool RenderThemeAndroid::paintButton(RenderObject* obj, const RenderObject::Pain
 {
     // If it is a disabled button, simply paint it to the master picture.
     Node* node = obj->node();
-    if (node && node->isElementNode() &&
-        static_cast<Element*>(node)->isEnabledFormControl())
-        RenderSkinButton::Draw(getCanvasFromInfo(info), rect, RenderSkinAndroid::kDisabled);
-    else
+    if (!node || !node->isElementNode()
+        || !static_cast<Element*>(node)->isEnabledFormControl()) {
+        RenderSkinButton::Draw(getCanvasFromInfo(info), rect,
+                RenderSkinAndroid::kDisabled);
+    } 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;
 }