Update Android tree with what was upstreamed in

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

3 files changed, 12 insertions, 7 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) 
diff --git a/WebCore/platform/android/RenderThemeAndroid.h b/WebCore/platform/android/RenderThemeAndroid.h
index 056b2d6..2e54302 100644
--- a/WebCore/platform/android/RenderThemeAndroid.h
+++ b/WebCore/platform/android/RenderThemeAndroid.h
@@ -47,7 +47,7 @@ struct ThemeData {
 
 class RenderThemeAndroid : public RenderTheme {
 public:
-    RenderThemeAndroid();
+    static PassRefPtr<RenderTheme> create();
     ~RenderThemeAndroid();
     
     virtual bool stateChanged(RenderObject*, ControlState) const;
@@ -97,10 +97,12 @@ protected:
     virtual bool paintSearchField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
 
 private:
+    RenderThemeAndroid();
     void addIntrinsicMargins(RenderStyle*) const;
     void close();
 
     bool supportsFocus(ControlPart);
+    friend RenderTheme* theme();
 };
 
 } // namespace WebCore
diff --git a/WebCore/platform/android/ScreenAndroid.cpp b/WebCore/platform/android/ScreenAndroid.cpp
index 4c31bd9..881c246 100644
--- a/WebCore/platform/android/ScreenAndroid.cpp
+++ b/WebCore/platform/android/ScreenAndroid.cpp
@@ -29,11 +29,10 @@
 #include "config.h"
 #include "Screen.h"
 
-#if PLATFORM(ANDROID)
 // This include must come first.
 #undef LOG // FIXME: Still have to do this to get the log to show up
 #include "utils/Log.h"
-#endif
+
 #include "FloatRect.h"
 #include "Widget.h"
 #include "ui/DisplayInfo.h"