Apply offset from the correct graphics layer; simplify code for link highlights.

third_party/WebKit/Source/core/layout/LayoutText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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
@@ skipping 411 matching lines @@
     if (ellipsisEndPosition >= truncation &&
         ellipsisStartPosition <= truncation)
       return ellipsis->selectionRect();
   }
 
   return IntRect();
 }
 
 void LayoutText::quads(Vector<FloatQuad>& quads,
                        ClippingOption option,
-                       LocalOrAbsoluteOption localOrAbsolute) const {
+                       LocalOrAbsoluteOption localOrAbsolute,
+                       MapCoordinatesFlags mode) const {
   for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
     FloatRect boundaries(box->frameRect());
 
     // Shorten the width of this text box if it ends in an ellipsis.
     // FIXME: ellipsisRectForBox should switch to return FloatRect soon with the
     // subpixellayout branch.
     IntRect ellipsisRect = (option == ClipToEllipsis)
                                ? ellipsisRectForBox(box, 0, textLength())
                                : IntRect();
     if (!ellipsisRect.isEmpty()) {
       if (style()->isHorizontalWritingMode())
         boundaries.setWidth(ellipsisRect.maxX() - boundaries.x());
       else
         boundaries.setHeight(ellipsisRect.maxY() - boundaries.y());
     }
     if (localOrAbsolute == AbsoluteQuads)
-      quads.append(localToAbsoluteQuad(boundaries));
+      quads.append(localToAbsoluteQuad(boundaries, mode));
     else
       quads.append(boundaries);
   }
 }
 
-void LayoutText::absoluteQuads(Vector<FloatQuad>& quads) const {
-  this->quads(quads, NoClipping, AbsoluteQuads);
+void LayoutText::absoluteQuads(Vector<FloatQuad>& quads,
+                               MapCoordinatesFlags mode) const {
+  this->quads(quads, NoClipping, AbsoluteQuads, mode);
 }
 
 void LayoutText::absoluteQuadsForRange(Vector<FloatQuad>& quads,
                                        unsigned start,
                                        unsigned end,
                                        bool useSelectionHeight) {
   // Work around signed/unsigned issues. This function takes unsigneds, and is
   // often passed UINT_MAX to mean "all the way to the end". InlineTextBox
   // coordinates are unsigneds, so changing this function to take ints causes
   // various internal mismatches. But selectionRect takes ints, and passing
@@ skipping 1521 matching lines @@
   LayoutRect rect = LayoutRect(
       IntRect(firstRunX(), firstRunY(), linesBox.width(), linesBox.height()));
   LayoutBlock* block = containingBlock();
   if (block && hasTextBoxes())
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink