Index: Source/core/rendering/RenderLayerScrollableArea.cpp |
diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp |
index d674e47200dfddf95f6c38f83b97fddf8b711bf2..1ce4940b3cb30b0fcb5555a8dabad331be8a10e9 100644 |
--- a/Source/core/rendering/RenderLayerScrollableArea.cpp |
+++ b/Source/core/rendering/RenderLayerScrollableArea.cpp |
@@ -75,11 +75,6 @@ namespace WebCore { |
const int ResizerControlExpandRatioForTouch = 2; |
-// Default value is set to 15 as the default |
-// minimum size used by firefox is 15x15. |
-static const int defaultMinimumWidthForResizing = 15; |
-static const int defaultMinimumHeightForResizing = 15; |
- |
RenderLayerScrollableArea::RenderLayerScrollableArea(RenderLayer& layer) |
: m_layer(layer) |
, m_inResizeMode(false) |
@@ -715,16 +710,6 @@ static bool overflowDefinesAutomaticScrollbar(EOverflow overflow) |
return overflow == OAUTO || overflow == OOVERLAY; |
} |
-IntSize RenderLayerScrollableArea::minimumSizeForResizing() |
-{ |
- int minimumWidth = intValueForLength(box().style()->logicalMinWidth(), box().containingBlock()->logicalWidth()); |
- int minimumHeight = intValueForLength(box().style()->logicalMinHeight(), box().containingBlock()->logicalHeight()); |
- |
- minimumWidth = std::max(minimumWidth, defaultMinimumWidthForResizing); |
- minimumHeight = std::max(minimumHeight, defaultMinimumHeightForResizing); |
- return IntSize(minimumWidth, minimumHeight); |
-} |
- |
void RenderLayerScrollableArea::updateAfterStyleChange(const RenderStyle* oldStyle) |
{ |
// List box parts handle the scrollbars by themselves so we have nothing to do. |
@@ -1365,6 +1350,8 @@ void RenderLayerScrollableArea::resize(const PlatformEvent& evt, const LayoutSiz |
newOffset.setHeight(newOffset.height() / zoomFactor); |
LayoutSize currentSize = LayoutSize(box().width() / zoomFactor, box().height() / zoomFactor); |
+ LayoutSize minimumSize = element->minimumSizeForResizing().shrunkTo(currentSize); |
+ element->setMinimumSizeForResizing(minimumSize); |
LayoutSize adjustedOldOffset = LayoutSize(oldOffset.width() / zoomFactor, oldOffset.height() / zoomFactor); |
if (box().style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) { |
@@ -1372,7 +1359,7 @@ void RenderLayerScrollableArea::resize(const PlatformEvent& evt, const LayoutSiz |
adjustedOldOffset.setWidth(-adjustedOldOffset.width()); |
} |
- LayoutSize difference = (currentSize + newOffset - adjustedOldOffset).expandedTo(minimumSizeForResizing()) - currentSize; |
+ LayoutSize difference = (currentSize + newOffset - adjustedOldOffset).expandedTo(minimumSize) - currentSize; |
bool isBoxSizingBorder = box().style()->boxSizing() == BORDER_BOX; |