Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 37 insertions, 17 deletions

diff --git a/Source/WebCore/rendering/RenderThemeChromiumWin.cpp b/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
index d538050..6f3be00 100644
--- a/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
+++ b/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
@@ -62,10 +62,15 @@ namespace WebCore {
 static const int kStandardMenuListButtonWidth = 17;
 
 namespace {
+// We must not create multiple ThemePainter instances.
 class ThemePainter {
 public:
     ThemePainter(GraphicsContext* context, const IntRect& r)
     {
+#ifndef NDEBUG
+        ASSERT(!s_hasInstance);
+        s_hasInstance = true;
+#endif
         TransparencyWin::TransformMode transformMode = getTransformMode(context->getCTM());
         m_helper.init(context, getLayerMode(context, transformMode), transformMode, r);
 
@@ -85,6 +90,9 @@ public:
     ~ThemePainter()
     {
         m_helper.composite();
+#ifndef NDEBUG
+        s_hasInstance = false;
+#endif
     }
 
     GraphicsContext* context() { return m_helper.context(); }
@@ -120,8 +128,15 @@ private:
     }
 
     TransparencyWin m_helper;
+#ifndef NDEBUG
+    static bool s_hasInstance;
+#endif
 };
 
+#ifndef NDEBUG
+bool ThemePainter::s_hasInstance = false;
+#endif
+
 } // namespace
 
 static void getNonClientMetrics(NONCLIENTMETRICS* metrics)
@@ -707,23 +722,28 @@ bool RenderThemeChromiumWin::paintInnerSpinButton(RenderObject* object, const Pa
 {
     IntRect half = rect;
 
-    half.setHeight(rect.height() / 2);
-    const ThemeData& upThemeData = getThemeData(object, SpinButtonUp);
-    ThemePainter upPainter(info.context, half);
-    PlatformBridge::paintSpinButton(upPainter.context(),
-                                    upThemeData.m_part,
-                                    upThemeData.m_state,
-                                    upThemeData.m_classicState,
-                                    upPainter.drawRect());
-
-    half.setY(rect.y() + rect.height() / 2);
-    const ThemeData& downThemeData = getThemeData(object, SpinButtonDown);
-    ThemePainter downPainter(info.context, half);
-    PlatformBridge::paintSpinButton(downPainter.context(),
-                                    downThemeData.m_part,
-                                    downThemeData.m_state,
-                                    downThemeData.m_classicState,
-                                    downPainter.drawRect());
+    // Need explicit blocks to avoid to create multiple ThemePainter instances.
+    {
+        half.setHeight(rect.height() / 2);
+        const ThemeData& upThemeData = getThemeData(object, SpinButtonUp);
+        ThemePainter upPainter(info.context, half);
+        PlatformBridge::paintSpinButton(upPainter.context(),
+                                        upThemeData.m_part,
+                                        upThemeData.m_state,
+                                        upThemeData.m_classicState,
+                                        upPainter.drawRect());
+    }
+
+    {
+        half.setY(rect.y() + rect.height() / 2);
+        const ThemeData& downThemeData = getThemeData(object, SpinButtonDown);
+        ThemePainter downPainter(info.context, half);
+        PlatformBridge::paintSpinButton(downPainter.context(),
+                                        downThemeData.m_part,
+                                        downThemeData.m_state,
+                                        downThemeData.m_classicState,
+                                        downPainter.drawRect());
+    }
     return false;
 }