Revert of Clip incremental invalidation rects for RenderBox

Revert of Clip incremental invalidation rects for RenderBox (patchset #3 id:40001 of https://codereview.chromium.org/548523005/)

Reason for revert:
Haven't looked into the issue deeply, but in the future we won't care about the invalidation rects, so we can just revert this kind of optimizations.

BUG=453586
Original issue's description:
> Clip incremental invalidation rects for RenderBox
> 
> RenderBox::incrementallyInvalidatePaint invalidates according to
> border-box delta, not considering the bounds. If the bounds are
> clipped by ancestor clipping, the incrementally invalidated rect
> may exceed the ancestor clipping.
> 
> Clip the incremental invalidation rects by oldBounds and newBounds
> to avoid invalidation on unrelated areas.
> 
> BUG=411420
> TEST=fast/repaint/resize-with-border-clipped.html
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182081

TBR=jchaffraix@chromium.org,dsinclair@chromium.org,esprehn@chromium.org,leviw@chromium.org
BUG=411420
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=189569

[Xianzhu, 2015-02-04 23:39:26]

Created Revert of Clip incremental invalidation rects for RenderBox

[Xianzhu, 2015-02-04 23:40:42]

The CQ bit was checked by wangxianzhu@chromium.org

[commit-bot: I haz the power, 2015-02-04 23:41:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899813004/130001

[commit-bot: I haz the power, 2015-02-04 23:41:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-04 23:41:44]

Failed to apply patch for Source/core/rendering/RenderBox.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/RenderBox.cpp
  Hunk #3 FAILED at 3999.
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/rendering/RenderBox.cpp.rej

Patch:       Source/core/rendering/RenderBox.cpp
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp
b/Source/core/rendering/RenderBox.cpp
index
ca885d0b9cade9a86bd1cdc7e62f4fc0a170bf42..95adef8597cd5cb0dbef63d9ecad7f97c106d8bd
100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -3961,7 +3961,7 @@ void RenderBox::incrementallyInvalidatePaint(const
RenderLayerModelObject& paint
     LayoutSize oldBorderBoxSize =
computePreviousBorderBoxSize(oldBounds.size());
     LayoutSize newBorderBoxSize = size();
 
-    // If border box size didn't change, RenderObject's
incrementallyInvalidatePaint() is good.
+    // If border box size didn't change, RenderBox's
incrementallyInvalidatePaint() is good.
     if (oldBorderBoxSize == newBorderBoxSize)
         return;
 
@@ -3985,7 +3985,7 @@ void RenderBox::incrementallyInvalidatePaint(const
RenderLayerModelObject& paint
             positionFromPaintInvalidationBacking.y(),
             deltaWidth + borderWidth,
             std::max(oldBorderBoxSize.height(), newBorderBoxSize.height()));
-        invalidatePaintRectClippedByOldAndNewBounds(paintInvalidationContainer,
rightDeltaRect, oldBounds, newBounds);
+        invalidatePaintUsingContainer(&paintInvalidationContainer,
rightDeltaRect, PaintInvalidationIncremental);
     }
 
     // Invalidate the bottom delta part and the bottom border of the old or new
box which has smaller height.
@@ -3999,28 +3999,10 @@ void RenderBox::incrementallyInvalidatePaint(const
RenderLayerModelObject& paint
             positionFromPaintInvalidationBacking.y() + smallerHeight -
borderHeight,
             std::max(oldBorderBoxSize.width(), newBorderBoxSize.width()),
             deltaHeight + borderHeight);
-        invalidatePaintRectClippedByOldAndNewBounds(paintInvalidationContainer,
bottomDeltaRect, oldBounds, newBounds);
+        invalidatePaintUsingContainer(&paintInvalidationContainer,
bottomDeltaRect, PaintInvalidationIncremental);
     }
 }
 
-void RenderBox::invalidatePaintRectClippedByOldAndNewBounds(const
RenderLayerModelObject& paintInvalidationContainer, const LayoutRect& rect,
const LayoutRect& oldBounds, const LayoutRect& newBounds)
-{
-    if (rect.isEmpty())
-        return;
-    LayoutRect rectClippedByOldBounds = intersection(rect, oldBounds);
-    LayoutRect rectClippedByNewBounds = intersection(rect, newBounds);
-    // Invalidate only once if the clipped rects equal.
-    if (rectClippedByOldBounds == rectClippedByNewBounds) {
-        invalidatePaintUsingContainer(&paintInvalidationContainer,
rectClippedByOldBounds, PaintInvalidationIncremental);
-        return;
-    }
-    // Invalidate the bigger one if one contains another. Otherwise invalidate
both.
-    if (!rectClippedByNewBounds.contains(rectClippedByOldBounds))
-        invalidatePaintUsingContainer(&paintInvalidationContainer,
rectClippedByOldBounds, PaintInvalidationIncremental);
-    if (!rectClippedByOldBounds.contains(rectClippedByNewBounds))
-        invalidatePaintUsingContainer(&paintInvalidationContainer,
rectClippedByNewBounds, PaintInvalidationIncremental);
-}
-
 void RenderBox::markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&
layoutScope)
 {
     ASSERT(!needsLayout());

[Xianzhu, 2015-02-04 23:46:31]

The CQ bit was checked by wangxianzhu@chromium.org

[commit-bot: I haz the power, 2015-02-04 23:47:33]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899813004/50002

[commit-bot: I haz the power, 2015-02-05 01:44:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-05 01:44:15]

Try jobs failed on following builders:
  linux_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/4...)

[Xianzhu, 2015-02-05 04:17:57]

The CQ bit was checked by wangxianzhu@chromium.org

[commit-bot: I haz the power, 2015-02-05 04:19:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899813004/160001

[commit-bot: I haz the power, 2015-02-05 15:36:20]

Committed patchset #4 (id:160001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=189569

[Xianzhu, 2015-02-23 17:48:57]

A revert of this CL (patchset #4 id:160001) has been created in
https://codereview.chromium.org/948513004/ by wangxianzhu@chromium.org.

The reason for reverting is: Suspected the original CL cause of the bug, but
proved not..