| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| index fd658ee88f2d7ee6a3e5ef4cd4dca1f38e2dfaac..1c53e242afe9626ce12102110c7ebfb19724f557 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -1981,14 +1981,10 @@ bool LayoutBox::needsForcedBreakBefore(EBreak previousBreakAfterValue) const
|
|
|
| LayoutRect LayoutBox::localOverflowRectForPaintInvalidation() const
|
| {
|
| - if (style()->visibility() != VISIBLE) {
|
| - PaintLayer* layer = enclosingLayer();
|
| - layer->updateDescendantDependentFlags();
|
| - if (layer->subtreeIsInvisible())
|
| - return LayoutRect();
|
| - }
|
| + if (style()->visibility() != VISIBLE)
|
| + return LayoutRect();
|
|
|
| - return visualOverflowRect();
|
| + return selfVisualOverflowRect();
|
| }
|
|
|
| void LayoutBox::inflateVisualRectForReflectionAndFilterUnderContainer(LayoutRect& rect, const LayoutObject& container, const LayoutBoxModelObject* ancestorToStopAt) const
|
| @@ -4448,8 +4444,7 @@ LayoutRect LayoutBox::visualOverflowRect() const
|
| return borderBoxRect();
|
| if (hasOverflowClip())
|
| return m_overflow->selfVisualOverflowRect();
|
| - // TODO(wangxianzhu): We should use normal unionRect() which ignores empty rects.
|
| - return unionRectEvenIfEmpty(m_overflow->selfVisualOverflowRect(), m_overflow->contentsVisualOverflowRect());
|
| + return unionRect(m_overflow->selfVisualOverflowRect(), m_overflow->contentsVisualOverflowRect());
|
| }
|
|
|
| LayoutUnit LayoutBox::offsetLeft() const
|
|
|