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

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

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 1c53e242afe9626ce12102110c7ebfb19724f557..fd658ee88f2d7ee6a3e5ef4cd4dca1f38e2dfaac 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1981,10 +1981,14 @@
 
 LayoutRect LayoutBox::localOverflowRectForPaintInvalidation() const
 {
-    if (style()->visibility() != VISIBLE)
-        return LayoutRect();
-
-    return selfVisualOverflowRect();
+    if (style()->visibility() != VISIBLE) {
+        PaintLayer* layer = enclosingLayer();
+        layer->updateDescendantDependentFlags();
+        if (layer->subtreeIsInvisible())
+            return LayoutRect();
+    }
+
+    return visualOverflowRect();
 }
 
 void LayoutBox::inflateVisualRectForReflectionAndFilterUnderContainer(LayoutRect& rect, const LayoutObject& container, const LayoutBoxModelObject* ancestorToStopAt) const
@@ -4444,7 +4448,8 @@
         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