Update Android tree with what was upstreamed in

https://bugs.webkit.org/show_bug.cgi?id=31423

1 files changed, 8 insertions, 4 deletions

diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index 929d9d8..ff20014 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -65,8 +65,13 @@ RenderTheme* theme()
 
 PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
 {
-    RefPtr<RenderThemeAndroid> androidTheme = new RenderThemeAndroid();
-    return androidTheme.release();
+    static RenderTheme* rt = RenderThemeAndroid::create().releaseRef();
+    return rt;
+}
+
+PassRefPtr<RenderTheme> RenderThemeAndroid::create()
+{
+    return adoptRef(new RenderThemeAndroid());
 }
 
 RenderThemeAndroid::RenderThemeAndroid()
@@ -269,8 +274,7 @@ bool RenderThemeAndroid::paintCombo(RenderObject* obj, const RenderObject::Paint
 {
     if (obj->style() && !obj->style()->backgroundColor().alpha())
         return true;
-    return RenderSkinCombo::Draw(getCanvasFromInfo(info), obj->node(), rect.x(),
-            rect.y(), rect.width(), rect.height());
+    return RenderSkinCombo::Draw(getCanvasFromInfo(info), obj->node(), rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 bool RenderThemeAndroid::paintMenuList(RenderObject* obj, const RenderObject::PaintInfo& info, const IntRect& rect)