Revert of Don't include contents visual overflow into paint invalidation rect

third_party/WebKit/Source/core/layout/LayoutBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1963 matching lines @@
     return joinFragmentainerBreakValues(previousBreakAfterValue, breakBefore());
 }
 
 bool LayoutBox::needsForcedBreakBefore(EBreak previousBreakAfterValue) const
 {
     return isForcedFragmentainerBreakValue(classABreakPointValue(previousBreakAfterValue));
 }
 
 LayoutRect LayoutBox::localOverflowRectForPaintInvalidation() const
 {
-    if (style()->visibility() != VISIBLE)
-        return LayoutRect();
+    if (style()->visibility() != VISIBLE) {
+        PaintLayer* layer = enclosingLayer();
+        layer->updateDescendantDependentFlags();
+        if (layer->subtreeIsInvisible())
+            return LayoutRect();
+    }
 
-    return selfVisualOverflowRect();
+    return visualOverflowRect();
 }
 
 void LayoutBox::inflateVisualRectForReflectionAndFilterUnderContainer(LayoutRect& rect, const LayoutObject& container, const LayoutBoxModelObject* ancestorToStopAt) const
 {
     // Apply visual overflow caused by reflections and filters defined on objects between this object
     // and container (not included) or ancestorToStopAt (included).
     LayoutSize offsetFromContainer = this->offsetFromContainer(&container);
     rect.move(offsetFromContainer);
     for (LayoutObject* parent = this->parent(); parent && parent != container; parent = parent->parent()) {
         if (parent->isBox()) {
@@ skipping 2439 matching lines @@
         rect.contract(scrollBarWidth, scrollBarHeight);
     return rect;
 }
 
 LayoutRect LayoutBox::visualOverflowRect() const
 {
     if (!m_overflow)
         return borderBoxRect();
     if (hasOverflowClip())
         return m_overflow->selfVisualOverflowRect();
-    return unionRect(m_overflow->selfVisualOverflowRect(), m_overflow->contentsVisualOverflowRect());
+    // TODO(wangxianzhu): We should use normal unionRect() which ignores empty rects.
+    return unionRectEvenIfEmpty(m_overflow->selfVisualOverflowRect(), m_overflow->contentsVisualOverflowRect());
 }
 
 LayoutUnit LayoutBox::offsetLeft() const
 {
     return adjustedPositionRelativeToOffsetParent(topLeftLocation()).x();
 }
 
 LayoutUnit LayoutBox::offsetTop() const
 {
     return adjustedPositionRelativeToOffsetParent(topLeftLocation()).y();
@@ skipping 386 matching lines @@
     if (!flowThread) {
         // If there's no flow thread, we're not nested. All pages have the same height. Give up.
         return strutToNextPage;
     }
     // Start searching for a suitable offset at the top of the next page or column.
     LayoutUnit flowThreadOffset = offsetFromLogicalTopOfFirstPage() + nextPageLogicalTop;
     return strutToNextPage + flowThread->nextLogicalTopForUnbreakableContent(flowThreadOffset, contentLogicalHeight) - flowThreadOffset;
 }
 
 } // namespace blink