| Index: Source/core/rendering/RenderLayerScrollableArea.cpp
|
| diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| index db17dc86836e0e73505ae696e504cc2e811dff1c..223ac402066f3a0e460f849cd355c87e5762904c 100644
|
| --- a/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| +++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| @@ -60,6 +60,7 @@
|
| #include "core/rendering/RenderGeometryMap.h"
|
| #include "core/rendering/RenderScrollbar.h"
|
| #include "core/rendering/RenderScrollbarPart.h"
|
| +#include "core/rendering/RenderTheme.h"
|
| #include "core/rendering/RenderView.h"
|
| #include "core/rendering/compositing/CompositedLayerMapping.h"
|
| #include "core/rendering/compositing/RenderLayerCompositor.h"
|
| @@ -573,10 +574,6 @@ void RenderLayerScrollableArea::scrollToOffset(const IntSize& scrollOffset, Scro
|
|
|
| void RenderLayerScrollableArea::updateAfterLayout()
|
| {
|
| - // List box parts handle the scrollbars by themselves so we have nothing to do.
|
| - if (box().style()->appearance() == ListboxPart)
|
| - return;
|
| -
|
| m_scrollDimensionsDirty = true;
|
| IntSize originalScrollOffset = adjustedScrollOffset();
|
|
|
| @@ -698,10 +695,6 @@ static bool overflowDefinesAutomaticScrollbar(EOverflow overflow)
|
|
|
| void RenderLayerScrollableArea::updateAfterStyleChange(const RenderStyle* oldStyle)
|
| {
|
| - // List box parts handle the scrollbars by themselves so we have nothing to do.
|
| - if (box().style()->appearance() == ListboxPart)
|
| - return;
|
| -
|
| // RenderView shouldn't provide scrollbars on its own.
|
| if (box().isRenderView())
|
| return;
|
| @@ -853,7 +846,10 @@ PassRefPtr<Scrollbar> RenderLayerScrollableArea::createScrollbar(ScrollbarOrient
|
| if (hasCustomScrollbarStyle) {
|
| widget = RenderScrollbar::createCustomScrollbar(this, orientation, actualRenderer->node());
|
| } else {
|
| - widget = Scrollbar::create(this, orientation, RegularScrollbar);
|
| + ScrollbarControlSize scrollbarSize = RegularScrollbar;
|
| + if (actualRenderer->style()->hasAppearance())
|
| + scrollbarSize = RenderTheme::theme().scrollbarControlSizeForPart(actualRenderer->style()->appearance());
|
| + widget = Scrollbar::create(this, orientation, scrollbarSize);
|
| if (orientation == HorizontalScrollbar)
|
| didAddScrollbar(widget.get(), HorizontalScrollbar);
|
| else
|
|
|