Use members rather than globals to avoid leaking memory.

Part of bug:3009375

Requires a change to frameworks/base.

Change-Id: I9f5e86afff4c87e16889eadf0ad0049120885480

1 files changed, 17 insertions, 3 deletions

diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index 66f034d..68b6441 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -44,6 +44,7 @@
 #include "RenderSkinRadio.h"
 #include "SkCanvas.h"
 #include "UserAgentStyleSheets.h"
+#include "WebCoreFrameBridge.h"
 
 namespace WebCore {
 
@@ -67,6 +68,13 @@ static SkCanvas* getCanvasFromInfo(const PaintInfo& info)
     return info.context->platformContext()->mCanvas;
 }
 
+static android::WebFrame* getWebFrame(const Node* node)
+{
+    if (!node)
+        return 0;
+    return android::WebFrame::getWebFrame(node->document()->frame());
+}
+
 RenderTheme* theme()
 {
     DEFINE_STATIC_LOCAL(RenderThemeAndroid, androidTheme, ());
@@ -223,9 +231,15 @@ 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())
-        RenderSkinButton::Draw(getCanvasFromInfo(info), rect, RenderSkinAndroid::kDisabled);
-    else
+    if (formControlElement && !formControlElement->isEnabledFormControl()) {
+        android::WebFrame* webFrame = getWebFrame(node);
+        if (webFrame) {
+            const RenderSkinAndroid* skins = webFrame->renderSkins();
+            if (skins)
+                skins->renderSkinButton()->draw(getCanvasFromInfo(info), rect,
+                                                RenderSkinAndroid::kDisabled);
+        }
+    } else
         // Store all the important information in the platform context.
         info.context->platformContext()->storeButtonInfo(node, rect);