Changeset 109483 in webkit

Timestamp:

Mar 1, 2012 6:39:38 PM (12 years ago)

Author:

morrita@google.com

Message:

Custom scrollbars do not support transparency
​https://bugs.webkit.org/show_bug.cgi?id=50547

Source/WebCore:

Patch by Hajime Morrita <​morrita@chromium.org> on 2012-03-01
Reviewed by James Robinson.

RenderScrollbar, which is used even for outermost frame when
-webkit-scrollbar is specified, assumes that its background is
painted by the enclosing container. But there is no such container
for outermost frame. This causes visual glitches when the
scrollbar has transparency.

This change clears background region for custom
outermostscrollbars to erase such glitches.

Test: fast/frames/transparent-scrollbar.html

• page/FrameView.cpp:

(WebCore::FrameView::paintScrollbar): The background is cleared here.
(WebCore):

• page/FrameView.h:

(FrameView):

• platform/ScrollView.cpp:

(WebCore::ScrollView::paintScrollbar): Added to hook in FrameView
(WebCore):
(WebCore::ScrollView::paintScrollbars):

• platform/ScrollView.h:

(ScrollView):

LayoutTests:

Reviewed by James Robinson.

• fast/frames/transparent-scrollbar.html: Added.
• fast/frames/transparent-scrollbar-expected.txt: Added.
• platform/chromium-linux/fast/frames/transparent-scrollbar-expected.png: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/transparent-scrollbar-expected.txt (added)
• LayoutTests/fast/frames/transparent-scrollbar.html (added)
• LayoutTests/platform/chromium-linux/fast/frames/transparent-scrollbar-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (2 diffs)
• Source/WebCore/page/FrameView.h (modified) (1 diff)
• Source/WebCore/platform/ScrollView.cpp (modified) (3 diffs)
• Source/WebCore/platform/ScrollView.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-01  MORITA Hajime  <morrita@google.com>
+
+        Custom scrollbars do not support transparency
+        https://bugs.webkit.org/show_bug.cgi?id=50547
+
+        Reviewed by James Robinson.
+
+        * fast/frames/transparent-scrollbar.html: Added.
+        * fast/frames/transparent-scrollbar-expected.txt: Added.
+        * platform/chromium-linux/fast/frames/transparent-scrollbar-expected.png: Added.
+
 2012-03-01  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Hajime Morrita  <morrita@chromium.org>
+
+        Custom scrollbars do not support transparency
+        https://bugs.webkit.org/show_bug.cgi?id=50547
+
+        Reviewed by James Robinson.
+
+        RenderScrollbar, which is used even for outermost frame when
+        -webkit-scrollbar is specified, assumes that its background is
+        painted by the enclosing container. But there is no such container
+        for outermost frame. This causes visual glitches when the
+        scrollbar has transparency.
+
+        This change clears background region for custom
+        outermostscrollbars to erase such glitches.
+
+        Test: fast/frames/transparent-scrollbar.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::paintScrollbar): The background is cleared here.
+        (WebCore):
+        * page/FrameView.h:
+        (FrameView):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::paintScrollbar): Added to hook in FrameView
+        (WebCore):
+        (WebCore::ScrollView::paintScrollbars):
+        * platform/ScrollView.h:
+        (ScrollView):
+
 2012-03-01  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2703 +2703 @@
 
     if (m_scrollCorner) {
+        bool needsBackgorund = m_frame->page() && m_frame->page()->mainFrame() == m_frame;
+        if (needsBackgorund)
+            context->fillRect(cornerRect, baseBackgroundColor(), ColorSpaceDeviceRGB);
         m_scrollCorner->paintIntoRect(context, cornerRect.location(), cornerRect);
         return;
@@ -2708 +2711 @@
 
     ScrollView::paintScrollCorner(context, cornerRect);
+}
+
+void FrameView::paintScrollbar(GraphicsContext* context, Scrollbar* bar, const IntRect& rect)
+{
+    bool needsBackgorund = bar->isCustomScrollbar() && (m_frame->page() && m_frame->page()->mainFrame() == m_frame);
+    if (needsBackgorund) {
+        IntRect toFill = bar->frameRect();
+        toFill.intersect(rect);
+        context->fillRect(toFill, baseBackgroundColor(), ColorSpaceDeviceRGB);
+    }
+
+    ScrollView::paintScrollbar(context, bar, rect);
 }
 

trunk/Source/WebCore/page/FrameView.h

@@ -231 +231 @@
     virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
     virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
+    virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&) OVERRIDE;
 
     Color documentBackgroundColor() const;

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -971 +971 @@
 }
 
+void ScrollView::paintScrollbar(GraphicsContext* context, Scrollbar* bar, const IntRect& rect)
+{
+    bar->paint(context, rect);
+}
+
 void ScrollView::invalidateScrollCornerRect(const IntRect& rect)
 {
@@ -983 +988 @@
 #endif
                                       )
-        m_horizontalScrollbar->paint(context, rect);
+        paintScrollbar(context, m_horizontalScrollbar.get(), rect);
     if (m_verticalScrollbar
 #if USE(ACCELERATED_COMPOSITING)
@@ -989 +994 @@
 #endif
                                     )
-        m_verticalScrollbar->paint(context, rect);
+        paintScrollbar(context, m_verticalScrollbar.get(), rect);
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/Source/WebCore/platform/ScrollView.h

@@ -273 +273 @@
     virtual IntRect scrollCornerRect() const;
     virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
+    virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&);
 
     virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const;