Changeset 107072 in webkit

Timestamp:

Feb 8, 2012 4:34:24 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

CSS2 overflow: scrollbar not visible on SELECT elements when overflow: scroll is set.
​https://bugs.webkit.org/show_bug.cgi?id=69993

Patch by Antaryami Pandia <​antaryami.pandia@motorola.com> on 2012-02-08
Reviewed by Simon Fraser.

Source/WebCore:

The issue was that for overflow:scroll, currently webkit always places the horizontal
and vertical scrollbar. But Since the listbox renderer handles its scrolling,
we should not set scrollbar for list-box.

Tests: fast/css/getComputedStyle/computed-style-select-overflow.html

fast/forms/select-overflow-scroll-inherited.html
fast/forms/select-overflow-scroll.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::layoutBlock):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateScrollInfoAfterLayout):

LayoutTests:

• fast/css/getComputedStyle/computed-style-select-overflow-expected.txt: Added.
• fast/css/getComputedStyle/computed-style-select-overflow.html: Added.
• fast/forms/select-overflow-scroll-inherited.html: Added.
• fast/forms/select-overflow-scroll.html: Added.
• platform/gtk/fast/forms/select-overflow-scroll-expected.txt: Added.
• platform/gtk/fast/forms/select-overflow-scroll-inherited-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/computed-style-select-overflow-expected.txt (added)
• LayoutTests/fast/css/getComputedStyle/computed-style-select-overflow.html (added)
• LayoutTests/fast/forms/select-overflow-scroll-inherited.html (added)
• LayoutTests/fast/forms/select-overflow-scroll.html (added)
• LayoutTests/platform/gtk/fast/forms/select-overflow-scroll-expected.txt (added)
• LayoutTests/platform/gtk/fast/forms/select-overflow-scroll-inherited-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-08  Antaryami Pandia  <antaryami.pandia@motorola.com>
+
+        CSS2 overflow: scrollbar not visible on SELECT elements when overflow: scroll is set.
+        https://bugs.webkit.org/show_bug.cgi?id=69993
+
+        Reviewed by Simon Fraser.
+
+        * fast/css/getComputedStyle/computed-style-select-overflow-expected.txt: Added.
+        * fast/css/getComputedStyle/computed-style-select-overflow.html: Added.
+        * fast/forms/select-overflow-scroll-inherited.html: Added.
+        * fast/forms/select-overflow-scroll.html: Added.
+        * platform/gtk/fast/forms/select-overflow-scroll-expected.txt: Added.
+        * platform/gtk/fast/forms/select-overflow-scroll-inherited-expected.txt: Added.
+
 2012-02-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-08  Antaryami Pandia  <antaryami.pandia@motorola.com>
+
+        CSS2 overflow: scrollbar not visible on SELECT elements when overflow: scroll is set.
+        https://bugs.webkit.org/show_bug.cgi?id=69993
+
+        Reviewed by Simon Fraser.
+
+        The issue was that for overflow:scroll, currently webkit always places the horizontal
+        and vertical scrollbar. But Since the listbox renderer handles its scrolling,
+        we should not set scrollbar for list-box.
+
+        Tests: fast/css/getComputedStyle/computed-style-select-overflow.html
+               fast/forms/select-overflow-scroll-inherited.html
+               fast/forms/select-overflow-scroll.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+
 2012-02-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1327 +1327 @@
 
     // For overflow:scroll blocks, ensure we have both scrollbars in place always.
-    if (scrollsOverflow()) {
+    if (scrollsOverflow() && style()->appearance() != ListboxPart) {
         if (styleToUse->overflowX() == OSCROLL)
             layer()->setHasHorizontalScrollbar(true);

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2338 +2338 @@
     
     // overflow:scroll should just enable/disable.
-    if (renderer()->style()->overflowX() == OSCROLL)
+    if (m_hBar && renderer()->style()->overflowX() == OSCROLL)
         m_hBar->setEnabled(horizontalOverflow);
-    if (renderer()->style()->overflowY() == OSCROLL)
+    if (m_vBar && renderer()->style()->overflowY() == OSCROLL)
         m_vBar->setEnabled(verticalOverflow);