Properly calculate the localBounds for elements with overflow clipped

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

Index: third_party/WebKit/Source/core/layout/ScrollAnchor.cpp
diff --git a/third_party/WebKit/Source/core/layout/ScrollAnchor.cpp b/third_party/WebKit/Source/core/layout/ScrollAnchor.cpp
index a916ee53c465371f43ae62025c966efd3bf25d47..d16bbed3575f12d768200941106ed21011b8e089 100644
--- a/third_party/WebKit/Source/core/layout/ScrollAnchor.cpp
+++ b/third_party/WebKit/Source/core/layout/ScrollAnchor.cpp
@@ -79,14 +79,16 @@ static LayoutRect relativeBounds(const LayoutObject* layoutObject, const Scrolla
     LayoutRect localBounds;
     if (layoutObject->isBox()) {
         localBounds = toLayoutBox(layoutObject)->borderBoxRect();
-        // borderBoxRect doesn't include overflow content and floats.
-        LayoutUnit maxHeight = std::max(localBounds.height(), toLayoutBox(layoutObject)->layoutOverflowRect().height());
-        if (layoutObject->isLayoutBlockFlow() && toLayoutBlockFlow(layoutObject)->containsFloats()) {
-            // Note that lowestFloatLogicalBottom doesn't include floating
-            // grandchildren.
-            maxHeight = std::max(maxHeight, toLayoutBlockFlow(layoutObject)->lowestFloatLogicalBottom());
+        if (!layoutObject->hasOverflowClip()) {
+            // borderBoxRect doesn't include overflow content and floats.
+            LayoutUnit maxHeight = std::max(localBounds.height(), toLayoutBox(layoutObject)->layoutOverflowRect().height());
+            if (layoutObject->isLayoutBlockFlow() && toLayoutBlockFlow(layoutObject)->containsFloats()) {
+                // Note that lowestFloatLogicalBottom doesn't include floating
+                // grandchildren.
+                maxHeight = std::max(maxHeight, toLayoutBlockFlow(layoutObject)->lowestFloatLogicalBottom());
+            }
+            localBounds.setHeight(maxHeight);
         }
-        localBounds.setHeight(maxHeight);
     } else if (layoutObject->isText()) {
         // TODO(skobes): Use first and last InlineTextBox only?
         for (InlineTextBox* box = toLayoutText(layoutObject)->firstTextBox(); box; box = box->nextTextBox())