Changeset 80353 in webkit

Timestamp:

Mar 4, 2011 8:07:12 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-04 Ilya Sherman <​isherman@chromium.org>

Reviewed by James Robinson.

Override paintScrollCorner() for FramelessScrollView to forego any custom scrollbar corner rendering.
This was previously done in ScrollbarThemeChromium, but we also need this on the Mac when the ScrollView
is a FramelessScrollView -- which is mostly just for Autofill.
In service of ​http://crbug.com/73772 (crash)
​https://bugs.webkit.org/show_bug.cgi?id=55557

No tests added because this fix is Chromium-specific and the code is currently untestable from within WebKit.
In particular, DRT crashes when trying to render a FramelessScrollView.

• platform/ScrollbarTheme.h: (WebCore::ScrollbarTheme::paintScrollCorner): Body moved to static function defaultPaintScrollCorner(). (WebCore::ScrollbarTheme::defaultPaintScrollCorner): Added.
• platform/chromium/FramelessScrollView.cpp: (WebCore::FramelessScrollView::paintContents): (WebCore::FramelessScrollView::paintScrollCorner): Fix implementation moved to here from ScrollbarThemeChromium
• platform/chromium/FramelessScrollView.h:
• platform/chromium/ScrollbarThemeChromium.cpp:
• platform/chromium/ScrollbarThemeChromium.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollbarTheme.h (modified) (1 diff)
• platform/chromium/FramelessScrollView.cpp (modified) (2 diffs)
• platform/chromium/FramelessScrollView.h (modified) (1 diff)
• platform/chromium/ScrollbarThemeChromium.cpp (modified) (1 diff)
• platform/chromium/ScrollbarThemeChromium.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-04  Ilya Sherman  <isherman@chromium.org>
+
+        Reviewed by James Robinson.
+
+        Override paintScrollCorner() for FramelessScrollView to forego any custom scrollbar corner rendering.
+        This was previously done in ScrollbarThemeChromium, but we also need this on the Mac when the ScrollView
+        is a FramelessScrollView -- which is mostly just for Autofill.
+        In service of http://crbug.com/73772 (crash)
+        https://bugs.webkit.org/show_bug.cgi?id=55557
+
+        No tests added because this fix is Chromium-specific and the code is currently untestable from within WebKit.
+        In particular, DRT crashes when trying to render a FramelessScrollView.
+
+        * platform/ScrollbarTheme.h:
+        (WebCore::ScrollbarTheme::paintScrollCorner): Body moved to static function defaultPaintScrollCorner().
+        (WebCore::ScrollbarTheme::defaultPaintScrollCorner): Added.
+        * platform/chromium/FramelessScrollView.cpp:
+        (WebCore::FramelessScrollView::paintContents):
+        (WebCore::FramelessScrollView::paintScrollCorner): Fix implementation moved to here from ScrollbarThemeChromium
+        * platform/chromium/FramelessScrollView.h:
+        * platform/chromium/ScrollbarThemeChromium.cpp:
+        * platform/chromium/ScrollbarThemeChromium.h:
+
 2011-03-04  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/platform/ScrollbarTheme.h

@@ -77 +77 @@
     virtual void invalidatePart(Scrollbar*, ScrollbarPart) {}
 
-    virtual void paintScrollCorner(ScrollView*, GraphicsContext* context, const IntRect& cornerRect) { context->fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB); }
+    virtual void paintScrollCorner(ScrollView*, GraphicsContext* context, const IntRect& cornerRect) { defaultPaintScrollCorner(context, cornerRect); }
+    static void defaultPaintScrollCorner(GraphicsContext* context, const IntRect& cornerRect) { context->fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB); }
 
     virtual bool shouldCenterOnThumb(Scrollbar*, const PlatformMouseEvent&) { return false; }

trunk/Source/WebCore/platform/chromium/FramelessScrollView.cpp

@@ -33 +33 @@
 
 #include "FramelessScrollViewClient.h"
+#include "ScrollbarTheme.h"
 
 namespace WebCore {
@@ -73 +74 @@
 }
 
-void FramelessScrollView::paintContents(GraphicsContext*, const IntRect& damageRect)
+void FramelessScrollView::paintContents(GraphicsContext*, const IntRect&)
 {
+}
+
+void FramelessScrollView::paintScrollCorner(GraphicsContext* context, const IntRect& cornerRect)
+{
+    // ScrollbarThemeComposite::paintScrollCorner incorrectly assumes that the ScrollView is a FrameView.
+    ScrollbarTheme::defaultPaintScrollCorner(context, cornerRect);
 }
 

trunk/Source/WebCore/platform/chromium/FramelessScrollView.h

@@ -75 +75 @@
     protected:
         // ScrollView protected methods:
-        virtual void paintContents(GraphicsContext*, const IntRect& damageRect);
+        virtual void paintContents(GraphicsContext*, const IntRect&);
+        virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
         virtual void contentsResized();
         virtual void visibleContentsResized();

trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp

@@ -138 +138 @@
 }
 
-void ScrollbarThemeChromium::paintScrollCorner(ScrollView* view, GraphicsContext* context, const IntRect& cornerRect)
-{
-    // ScrollbarThemeComposite::paintScrollCorner incorrectly assumes that the
-    // ScrollView is a FrameView (see FramelessScrollView), so we cannot let
-    // that code run.  For FrameView's this is correct since we don't do custom
-    // scrollbar corner rendering, which ScrollbarThemeComposite supports.
-    ScrollbarTheme::paintScrollCorner(view, context, cornerRect);
-}
-
 } // namespace WebCore

trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromium.h

@@ -49 +49 @@
         virtual IntRect trackRect(Scrollbar*, bool painting = false);
 
-        virtual void paintScrollCorner(ScrollView*, GraphicsContext*, const IntRect&);
-
         virtual void paintTrackBackground(GraphicsContext*, Scrollbar*, const IntRect&);
         virtual void paintTickmarks(GraphicsContext*, Scrollbar*, const IntRect&);