Preparation for combining paths of focus rings and outlines

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
  * modify it under the terms of the GNU Library General Public
@@ skipping 603 matching lines @@
     offset.move(absPos.x(), absPos.y());
     return toIntSize(offset);
 }
 
 FloatQuad LayoutBox::absoluteContentQuad() const
 {
     LayoutRect rect = contentBoxRect();
     return localToAbsoluteQuad(FloatRect(rect));
 }
 
-void LayoutBox::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+void LayoutBox::addOutlineRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
 {
     if (!size().isEmpty())
         rects.append(LayoutRect(additionalOffset, size()));
 }
 
 bool LayoutBox::canResize() const
 {
     // We need a special case for <iframe> because they never have
     // hasOverflowClip(). However, they do "implicitly" clip their contents, so
     // we want to allow resizing them also.
@@ skipping 3468 matching lines @@
 
     if (style()->hasBorderImageOutsets()) {
         LayoutRectOutsets borderOutsets = style()->borderImageOutsets();
         top = std::max(top, borderOutsets.top());
         right = std::max(right, borderOutsets.right());
         bottom = std::max(bottom, borderOutsets.bottom());
         left = std::max(left, borderOutsets.left());
     }
 
     if (style()->hasOutline()) {
+        int outlineOutset = style()->outlineOutsetExtent();
         if (style()->outlineStyleIsAuto()) {
             // The result focus ring rects are in coordinates of this object's border box.
             Vector<LayoutRect> focusRingRects;
-            addFocusRingRects(focusRingRects, LayoutPoint());
+            addOutlineRects(focusRingRects, LayoutPoint());
             LayoutRect rect = unionRect(focusRingRects);
 
-            int outlineSize = GraphicsContext::focusRingOutsetExtent(style()->outlineOffset(), style()->outlineWidth());
-            top = std::max(top, -rect.y() + outlineSize);
-            right = std::max(right, rect.maxX() - size().width() + outlineSize);
-            bottom = std::max(bottom, rect.maxY() - size().height() + outlineSize);
-            left = std::max(left, -rect.x() + outlineSize);
+            top = std::max(top, -rect.y() + outlineOutset);
+            right = std::max(right, rect.maxX() - size().width() + outlineOutset);
+            bottom = std::max(bottom, rect.maxY() - size().height() + outlineOutset);
+            left = std::max(left, -rect.x() + outlineOutset);
         } else {
-            LayoutUnit outlineSize = style()->outlineSize();
-            top = std::max(top, outlineSize);
-            right = std::max(right, outlineSize);
-            bottom = std::max(bottom, outlineSize);
-            left = std::max(left, outlineSize);
+            top = std::max<LayoutUnit>(top, outlineOutset);
+            right = std::max<LayoutUnit>(right, outlineOutset);
+            bottom = std::max<LayoutUnit>(bottom, outlineOutset);
+            left = std::max<LayoutUnit>(left, outlineOutset);
         }
     }
 
     return LayoutRectOutsets(top, right, bottom, left);
 }
 
 void LayoutBox::addOverflowFromChild(LayoutBox* child, const LayoutSize& delta)
 {
     // Never allow flow threads to propagate overflow up to a parent.
     if (child->isLayoutFlowThread())
@@ skipping 645 matching lines @@
     StyleImage* borderImage = style()->borderImage().image();
     return borderImage && borderImage->canRender(*this, style()->effectiveZoom()) && borderImage->isLoaded();
 }
 
 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const
 {
     return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
 }
 
 } // namespace blink