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 1345 matching lines @@
 
 void RenderInline::imageChanged(WrappedImagePtr, const IntRect*)
 {
     if (!parent())
         return;
 
     // FIXME: We can do better.
     setShouldDoFullPaintInvalidation(true);
 }
 
-void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
-{
-    AbsoluteRectsGeneratorContext 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);
-        else
-            continuation()->addFocusRingRects(rects, flooredLayoutPoint(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::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
+{
+    AbsoluteLayoutRectsGeneratorContext 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;
+        LayoutPoint continuationAdditionalOffset = additionalOffset;
+        continuationAdditionalOffset.move(continuation()->isInline()
+            ? continuation()->containingBlock()->location() - containingBlock()->location()
+            : toRenderBox(continuation())->location() - containingBlock()->location());

[Julien - ping for review, 2014/08/20 22:12:31]

I found the previous structure more readable.

We shouldn't move this function, else we lose the history and get a bigger (more
difficult to review) diff.

[Xianzhu, 2014/09/04 00:29:12]

Done.
Unfortunately, actually I moved 'class AbsoluteLayoutRectsGeneratorContext' up
because addFocusRingRects uses it.

Fortunately, in the new patch set, because of previous changes, the diff shows
the moving as we expect :)

+        continuation()->addFocusRingRects(rects, continuationAdditionalOffset, paintContainer);
+    }
+}
+
 void RenderInline::computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutPoint& layerOffset) const
 {
     AbsoluteLayoutRectsGeneratorContext context(rects, layerOffset);
     generateLineBoxRects(context);
 }
 
 void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (!hasOutline())
         return;
@@ skipping 165 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