Use LayoutRect during addFocusRingRects to avoid loss of precision

Source/core/rendering/RenderInline.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 1357 matching lines @@
 {
     if (!parent())
         return;
 
     // FIXME: We can do better.
     setShouldDoFullPaintInvalidation(true);
 }
 
 namespace {
 
-class AbsoluteRectsIgnoringEmptyRectsGeneratorContext : public AbsoluteRectsGeneratorContext {
+class AbsoluteLayoutRectsGeneratorContext {
 public:
-    AbsoluteRectsIgnoringEmptyRectsGeneratorContext(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset)
-        : AbsoluteRectsGeneratorContext(rects, accumulatedOffset) { }
+    AbsoluteLayoutRectsGeneratorContext(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
+        : m_rects(rects)
+        , m_accumulatedOffset(accumulatedOffset) { }
+
+    void operator()(const FloatRect& rect)
+    {
+        LayoutRect layoutRect(rect);
+        layoutRect.move(m_accumulatedOffset.x(), m_accumulatedOffset.y());
+        m_rects.append(layoutRect);
+    }
+private:
+    Vector<LayoutRect>& m_rects;
+    const LayoutPoint& m_accumulatedOffset;
+};
+
+class AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext : public AbsoluteLayoutRectsGeneratorContext {
+public:
+    AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
+        : AbsoluteLayoutRectsGeneratorContext(rects, accumulatedOffset) { }
 
     void operator()(const FloatRect& rect)
     {
         if (!rect.isEmpty())
-            AbsoluteRectsGeneratorContext::operator()(rect);
+            AbsoluteLayoutRectsGeneratorContext::operator()(rect);
     }
 };
 
 } // unnamed namespace
 
-void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
+void RenderInline::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
 {
-    AbsoluteRectsIgnoringEmptyRectsGeneratorContext context(rects, additionalOffset);
+    AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext context(rects, additionalOffset);
     generateLineBoxRects(context);
 
     addChildFocusRingRects(rects, additionalOffset, paintContainer);
 
     if (continuation()) {
         // If the continuation doesn't paint into the same container, let its paint invalidation container handle it.
         if (paintContainer != continuation()->containerForPaintInvalidation())
             return;
         if (continuation()->isInline())
-            continuation()->addFocusRingRects(rects, flooredLayoutPoint(additionalOffset + continuation()->containingBlock()->location() - containingBlock()->location()), paintContainer);
+            continuation()->addFocusRingRects(rects, additionalOffset + (continuation()->containingBlock()->location() - containingBlock()->location()), paintContainer);
         else
-            continuation()->addFocusRingRects(rects, flooredLayoutPoint(additionalOffset + toRenderBox(continuation())->location() - containingBlock()->location()), paintContainer);
+            continuation()->addFocusRingRects(rects, additionalOffset + (toRenderBox(continuation())->location() - containingBlock()->location()), paintContainer);
     }
 }
 
-namespace {
-
-class AbsoluteLayoutRectsGeneratorContext {
-public:
-    AbsoluteLayoutRectsGeneratorContext(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset)
-        : m_rects(rects)
-        , m_accumulatedOffset(accumulatedOffset) { }
-
-    void operator()(const FloatRect& rect)
-    {
-        LayoutRect layoutRect(rect);
-        layoutRect.move(m_accumulatedOffset.x(), m_accumulatedOffset.y());
-        m_rects.append(layoutRect);
-    }
-private:
-    Vector<LayoutRect>& m_rects;
-    const LayoutPoint& m_accumulatedOffset;
-};
-
-}
-
 void RenderInline::computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutPoint& layerOffset) const
 {
     AbsoluteLayoutRectsGeneratorContext context(rects, layerOffset);
     generateLineBoxRects(context);
 }
 
 void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     RenderStyle* styleToUse = style();
     if (!styleToUse->hasOutline())
@@ skipping 166 matching lines @@
         container = this;
 
     FloatPoint absPos = container->localToAbsolute();
     region.bounds.setX(absPos.x() + region.bounds.x());
     region.bounds.setY(absPos.y() + region.bounds.y());
 
     regions.append(region);
 }
 
 } // namespace blink