Preparation for combining paths of focus rings and outlines

Source/core/layout/LayoutBoxModelObject.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 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 355 matching lines @@
     ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
 
     if (layer()->groupedMapping()) {
         if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashingLayer())
             squashingLayer->invalidateDisplayItemClient(displayItemClient);
     } else if (CompositedDeprecatedPaintLayerMapping* compositedDeprecatedPaintLayerMapping = layer()->compositedDeprecatedPaintLayerMapping()) {
         compositedDeprecatedPaintLayerMapping->invalidateDisplayItemClient(displayItemClient);
     }
 }
 
-void LayoutBoxModelObject::addFocusRingRectsForNormalChildren(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+void LayoutBoxModelObject::addOutlineRectsForNormalChildren(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
 {
     for (LayoutObject* child = slowFirstChild(); child; child = child->nextSibling()) {
-        // Focus rings of out-of-flow positioned descendants are handled in LayoutBlock::addFocusRingRects().
+        // Outlines of out-of-flow positioned descendants are handled in LayoutBlock::addOutlineRects().
         if (child->isOutOfFlowPositioned())
             continue;
 
-        // Focus ring of an element continuation or anonymous block continuation is added when we iterate the continuation chain.
-        // See LayoutBlock::addFocusRingRects() and LayoutInline::addFocusRingRects().
+        // Outline of an element continuation or anonymous block continuation is added when we iterate the continuation chain.
+        // See LayoutBlock::addOutlineRects() and LayoutInline::addOutlineRects().
         if (child->isElementContinuation()
             || (child->isLayoutBlock() && toLayoutBlock(child)->isAnonymousBlockContinuation()))
             continue;
 
-        addFocusRingRectsForDescendant(*child, rects, additionalOffset);
+        addOutlineRectsForDescendant(*child, rects, additionalOffset);
     }
 }
 
-void LayoutBoxModelObject::addFocusRingRectsForDescendant(const LayoutObject& descendant, Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+void LayoutBoxModelObject::addOutlineRectsForDescendant(const LayoutObject& descendant, Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
 {
     if (descendant.isText() || descendant.isListMarker())
         return;
 
     if (descendant.hasLayer()) {
-        Vector<LayoutRect> layerFocusRingRects;
-        descendant.addFocusRingRects(layerFocusRingRects, LayoutPoint());
-        for (size_t i = 0; i < layerFocusRingRects.size(); ++i) {
-            FloatQuad quadInBox = toLayoutBoxModelObject(descendant).localToContainerQuad(FloatQuad(layerFocusRingRects[i]), this);
+        Vector<LayoutRect> layerOutlineRects;
+        descendant.addOutlineRects(layerOutlineRects, LayoutPoint());
+        for (size_t i = 0; i < layerOutlineRects.size(); ++i) {
+            FloatQuad quadInBox = toLayoutBoxModelObject(descendant).localToContainerQuad(FloatQuad(layerOutlineRects[i]), this);
             LayoutRect rect = LayoutRect(quadInBox.boundingBox());
             if (!rect.isEmpty()) {
                 rect.moveBy(additionalOffset);
                 rects.append(rect);
             }
         }
         return;
     }
 
     if (descendant.isBox()) {
-        descendant.addFocusRingRects(rects, additionalOffset + toLayoutBox(descendant).locationOffset());
+        descendant.addOutlineRects(rects, additionalOffset + toLayoutBox(descendant).locationOffset());
         return;
     }
 
-    descendant.addFocusRingRects(rects, additionalOffset);
+    descendant.addOutlineRects(rects, additionalOffset);
 }
 
 bool LayoutBoxModelObject::calculateHasBoxDecorations() const
 {
     const ComputedStyle& styleToUse = styleRef();
     return hasBackground() || styleToUse.hasBorderDecoration() || styleToUse.hasAppearance() || styleToUse.boxShadow();
 }
 
 bool LayoutBoxModelObject::hasNonEmptyLayoutSize() const
 {
@@ skipping 575 matching lines @@
     if (rootElementStyle->hasBackground())
         return false;
 
     if (node() != document().firstBodyElement())
         return false;
 
     return true;
 }
 
 } // namespace blink