[S.P.] Use a correct bounding box for outlines of LayoutInlines for cull rects.

Source/core/paint/InlinePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/InlinePainter.h"
 
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutTheme.h"
@@ skipping 13 matching lines @@
     ANNOTATE_GRAPHICS_CONTEXT(paintInfo, &m_layoutInline);
     LineBoxListPainter(*m_layoutInline.lineBoxes()).paint(&m_layoutInline, paintInfo, paintOffset);
 }
 
 void InlinePainter::paintOutline(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     const LayoutStyle& styleToUse = m_layoutInline.styleRef();
     if (!styleToUse.hasOutline())
         return;
 
-    LayoutRect bounds;
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        // FIXME: Use tighter bounds.
-        LayoutBlock* cb = m_layoutInline.containingBlock();
-        bounds = cb->visualOverflowRect();
-        bounds.moveBy(paintOffset);
-    }
-    LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutInline, paintInfo.phase, bounds);
-    if (recorder.canUseCachedDrawing())
-        return;
-
     if (styleToUse.outlineStyleIsAuto()) {
         if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_layoutInline)) {
+            Vector<LayoutRect> focusRingRects;
+            m_layoutInline.addFocusRingRects(focusRingRects, paintOffset);
+            LayoutRect focusRingBoundingRect;
+            for (const auto& rect : focusRingRects)
+                focusRingBoundingRect.unite(rect);
+
+            LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutInline, paintInfo.phase, focusRingBoundingRect);
+            if (recorder.canUseCachedDrawing())
+                return;
+
             // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
-            ObjectPainter(m_layoutInline).paintFocusRing(paintInfo, paintOffset, styleToUse);
+            ObjectPainter(m_layoutInline).paintFocusRing(paintInfo, styleToUse, focusRingRects);
         }
         return;
     }
 
     if (styleToUse.outlineStyle() == BNONE)
         return;
 
     Vector<LayoutRect> rects;
 
     rects.append(LayoutRect());
     for (InlineFlowBox* curr = m_layoutInline.firstLineBox(); curr; curr = curr->nextLineBox()) {
         RootInlineBox& root = curr->root();
         LayoutUnit top = std::max<LayoutUnit>(root.lineTop(), curr->logicalTop());
         LayoutUnit bottom = std::min<LayoutUnit>(root.lineBottom(), curr->logicalBottom());
         rects.append(LayoutRect(curr->x(), top, curr->logicalWidth(), bottom - top));
     }
     rects.append(LayoutRect());
 
     Color outlineColor = m_layoutInline.resolveColor(styleToUse, CSSPropertyOutlineColor);
     bool useTransparencyLayer = outlineColor.hasAlpha();
 
+    LayoutRect bounds;
+    for (const auto& rect : rects)
+        bounds.unite(rect);
+    bounds.moveBy(paintOffset);
+
+    LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutInline, paintInfo.phase, bounds);
+    if (recorder.canUseCachedDrawing())
+        return;
+
     GraphicsContext* graphicsContext = paintInfo.context;
     if (useTransparencyLayer) {
         graphicsContext->beginTransparencyLayer(static_cast<float>(outlineColor.alpha()) / 255);
         outlineColor = Color(outlineColor.red(), outlineColor.green(), outlineColor.blue());
     }
 
     for (unsigned i = 1; i < rects.size() - 1; i++)
         paintOutlineForLine(graphicsContext, paintOffset, rects.at(i - 1), rects.at(i), rects.at(i + 1), outlineColor);
 
     if (useTransparencyLayer)
@@ skipping 110 matching lines @@
             pixelSnappedBox.maxX() + outlineWidth,
             pixelSnappedBox.maxY() + outlineWidth,
             BSBottom, outlineColor, outlineStyle,
             outlineWidth,
             outlineWidth,
             antialias);
     }
 }
 
 } // namespace blink