| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index a18ab22ce0bc044933cbbba4ced6a615213cfcce..a91b7f591abcb4b9d3cb0c4ea59cf165437d9ea4 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -2158,11 +2158,7 @@ void RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping
|
| if (delta.isZero())
|
| return;
|
|
|
| - bool restrictedByLineClamp = false;
|
| - if (renderer()->parent())
|
| - restrictedByLineClamp = !renderer()->parent()->style()->lineClamp().isNone();
|
| -
|
| - if (renderer()->hasOverflowClip() && !restrictedByLineClamp) {
|
| + if (renderer()->hasOverflowClip()) {
|
| IntSize newScrollOffset = adjustedScrollOffset() + delta;
|
| m_scrollableArea->scrollToOffset(newScrollOffset, clamp);
|
|
|
| @@ -2214,15 +2210,10 @@ void RenderLayer::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignm
|
| RenderLayer* parentLayer = 0;
|
| LayoutRect newRect = rect;
|
|
|
| - bool restrictedByLineClamp = false;
|
| - if (renderer()->parent()) {
|
| + if (renderer()->parent())
|
| parentLayer = renderer()->parent()->enclosingLayer();
|
| - restrictedByLineClamp = !renderer()->parent()->style()->lineClamp().isNone();
|
| - }
|
|
|
| - if (renderer()->hasOverflowClip() && !restrictedByLineClamp) {
|
| - // Don't scroll to reveal an overflow layer that is restricted by the -webkit-line-clamp property.
|
| - // This will prevent us from revealing text hidden by the slider in Safari RSS.
|
| + if (renderer()->hasOverflowClip()) {
|
| RenderBox* box = renderBox();
|
| ASSERT(box);
|
| LayoutRect localExposeRect(box->absoluteToLocalQuad(FloatQuad(FloatRect(rect)), UseTransforms).boundingBox());
|
|
|