Refactor InlineBox::calculateBoundaries()

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 355 matching lines @@
   // clamp our unsigned parameters to INT_MAX.
   ASSERT(end == UINT_MAX || end <= INT_MAX);
   ASSERT(start <= INT_MAX);
   start = std::min(start, static_cast<unsigned>(INT_MAX));
   end = std::min(end, static_cast<unsigned>(INT_MAX));
 
   for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
     // Note: box->end() returns the index of the last character, not the index
     // past it
     if (start <= box->start() && box->end() < end) {
-      FloatRect r(box->calculateBoundaries());
+      FloatRect r(box->frameRect());
       if (useSelectionHeight) {
         LayoutRect selectionRect = box->localSelectionRect(start, end);
         if (box->isHorizontal()) {
           r.setHeight(selectionRect.height().toFloat());
           r.setY(selectionRect.y().toFloat());
         } else {
           r.setWidth(selectionRect.width().toFloat());
           r.setX(selectionRect.x().toFloat());
         }
       }
@@ skipping 31 matching lines @@
       return ellipsis->selectionRect();
   }
 
   return IntRect();
 }
 
 void LayoutText::quads(Vector<FloatQuad>& quads,
                        ClippingOption option,
                        LocalOrAbsoluteOption localOrAbsolute) const {
   for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
-    FloatRect boundaries(box->calculateBoundaries());
+    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());
@@ skipping 32 matching lines @@
 
   // Narrows |start| and |end| into |caretMinOffset| and |careMaxOffset|
   // to ignore unrendered leading and trailing whitespaces.
   start = std::min(std::max(caretMinOffset, start), caretMaxOffset);
   end = std::min(std::max(caretMinOffset, end), caretMaxOffset);
 
   for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
     // Note: box->end() returns the index of the last character, not the index
     // past it
     if (start <= box->start() && box->end() < end) {
-      LayoutRect r(box->calculateBoundaries());
+      LayoutRect r(box->frameRect());
       if (useSelectionHeight) {
         LayoutRect selectionRect = box->localSelectionRect(start, end);
         if (box->isHorizontal()) {
           r.setHeight(selectionRect.height());
           r.setY(selectionRect.y());
         } else {
           r.setWidth(selectionRect.width());
           r.setX(selectionRect.x());
         }
       }
@@ skipping 1482 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