Unify all types of overflow-related clips for paint and hit testing.

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
index 84f73800fe78b00d47e3f8099e826ebc6d7267fb..804bd9e5952f157c54a18bd20b961a10572a52e0 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -636,9 +636,7 @@ void PaintPropertyTreeBuilder::updateOverflowClip(
     // those children. This is called control clip and we technically treat them
     // like overflow clip.
     LayoutRect clipRect;
-    if (box.hasControlClip()) {
-      clipRect = box.controlClipRect(context.current.paintOffset);
-    } else if (box.shouldClipOverflow()) {
+    if (box.shouldClipOverflow()) {
       clipRect = LayoutRect(pixelSnappedIntRect(
           box.overflowClipRect(context.current.paintOffset)));
     } else {