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

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
@@ skipping 1381 matching lines @@
 
   bool shouldHitTestSelf = isInSelfHitTestingPhase(action);
 
   if (shouldHitTestSelf && hasOverflowClip() &&
       hitTestOverflowControl(result, locationInContainer, adjustedLocation))
     return true;
 
   // TODO(pdr): We should also check for css clip in the !isSelfPaintingLayer
   //            case, similar to overflow clip below.
   bool skipChildren = false;
-  if (hasOverflowClip() && !hasSelfPaintingLayer()) {
+  if (shouldClipOverflow() && !hasSelfPaintingLayer()) {
     if (!locationInContainer.intersects(overflowClipRect(
             adjustedLocation, ExcludeOverlayScrollbarSizeForHitTesting))) {
       skipChildren = true;
     } else if (style()->hasBorderRadius()) {
       LayoutRect boundsRect(adjustedLocation, size());
       skipChildren = !locationInContainer.intersects(
           style()->getRoundedInnerBorderFor(boundsRect));
     }
   }
 
-  // A control clip can also clip out child hit testing.
-  if (!skipChildren && hasControlClip() &&
-      !locationInContainer.intersects(controlClipRect(adjustedLocation)))
-    skipChildren = true;
-
   // TODO(pdr): We should also include checks for hit testing border radius at
   //            the layer level (see: crbug.com/568904).
 
   if (!skipChildren &&
       hitTestChildren(result, locationInContainer, adjustedLocation, action))
     return true;
 
   if (style()->hasBorderRadius() &&
       hitTestClippedOutByBorder(locationInContainer, adjustedLocation))
     return false;
@@ skipping 362 matching lines @@
     const LayoutPoint& location,
     OverlayScrollbarClipBehavior overlayScrollbarClipBehavior) const {
   // FIXME: When overflow-clip (CSS3) is implemented, we'll obtain the property
   // here.
   LayoutRect clipRect = borderBoxRect();
   clipRect.setLocation(location + clipRect.location() +
                        LayoutSize(borderLeft(), borderTop()));
   clipRect.setSize(clipRect.size() - LayoutSize(borderLeft() + borderRight(),
                                                 borderTop() + borderBottom()));
 
+  if (hasControlClip())

[pdr., 2017/01/23 18:46:12]

I think this needs to be after excludeScrollbars.

[chrishtr, 2017/01/23 18:53:20]

DONE!!!

+    clipRect.intersect(controlClipRect(location));
+
   if (hasOverflowClip())
     excludeScrollbars(clipRect, overlayScrollbarClipBehavior);
+
   return clipRect;
 }
 
 void LayoutBox::excludeScrollbars(
     LayoutRect& rect,
     OverlayScrollbarClipBehavior overlayScrollbarClipBehavior) const {
   if (PaintLayerScrollableArea* scrollableArea = this->getScrollableArea()) {
     if (shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) {
       rect.move(
           scrollableArea->verticalScrollbarWidth(overlayScrollbarClipBehavior),
@@ skipping 3881 matching lines @@
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 bool LayoutBox::shouldClipOverflow() const {
   return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
 }
 
 }  // namespace blink