Remove use_selection_height usage in LayoutText

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 325 matching lines @@
 void LayoutText::AbsoluteRects(Vector<IntRect>& rects,
                                const LayoutPoint& accumulated_offset) const {
   for (InlineTextBox* box = FirstTextBox(); box; box = box->NextTextBox()) {
     rects.push_back(EnclosingIntRect(LayoutRect(
         LayoutPoint(accumulated_offset) + box->Location(), box->Size())));
   }
 }
 
 static FloatRect LocalQuadForTextBox(InlineTextBox* box,
                                      unsigned start,
-                                     unsigned end,
-                                     bool use_selection_height) {
+                                     unsigned end) {
   unsigned real_end = std::min(box->end() + 1, end);
   LayoutRect r = box->LocalSelectionRect(start, real_end);
   if (r.Height()) {
-    if (!use_selection_height) {
-      // Change the height and y position (or width and x for vertical text)
-      // because selectionRect uses selection-specific values.
-      if (box->IsHorizontal()) {
-        r.SetHeight(box->Height());
-        r.SetY(box->Y());
-      } else {
-        r.SetWidth(box->Width());
-        r.SetX(box->X());
-      }
+    // Change the height and y position (or width and x for vertical text)
+    // because selectionRect uses selection-specific values.
+    if (box->IsHorizontal()) {
+      r.SetHeight(box->Height());
+      r.SetY(box->Y());
+    } else {
+      r.SetWidth(box->Width());
+      r.SetX(box->X());
     }
     return FloatRect(r);
   }
   return FloatRect();
 }
 
 void LayoutText::AbsoluteRectsForRange(Vector<IntRect>& rects,
                                        unsigned start,
-                                       unsigned end,
-                                       bool use_selection_height) const {
+                                       unsigned end) const {
   // 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
   // UINT_MAX to it causes trouble. Ideally we'd change selectionRect to take
   // unsigneds, but that would cause many ripple effects, so for now we'll just
   // clamp our unsigned parameters to INT_MAX.
   DCHECK(end == UINT_MAX || end <= INT_MAX);
   DCHECK_LE(start, static_cast<unsigned>(INT_MAX));
   start = std::min(start, static_cast<unsigned>(INT_MAX));
   end = std::min(end, static_cast<unsigned>(INT_MAX));
 
   // This function is always called in sequence that this check should work.
   bool has_checked_box_in_range = !rects.IsEmpty();
 
   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->FrameRect());
-      if (use_selection_height) {
-        LayoutRect selection_rect = box->LocalSelectionRect(start, end);
-        if (box->IsHorizontal()) {
-          r.SetHeight(selection_rect.Height().ToFloat());
-          r.SetY(selection_rect.Y().ToFloat());
-        } else {
-          r.SetWidth(selection_rect.Width().ToFloat());
-          r.SetX(selection_rect.X().ToFloat());
-        }
-      }
       if (!has_checked_box_in_range) {
         has_checked_box_in_range = true;
         rects.clear();
       }
       rects.push_back(LocalToAbsoluteQuad(r).EnclosingBoundingBox());
     } else if ((box->Start() <= start && start <= box->end()) ||
                (box->Start() < end && end <= box->end())) {
-      FloatRect rect =
-          LocalQuadForTextBox(box, start, end, use_selection_height);
+      FloatRect rect = LocalQuadForTextBox(box, start, end);
       if (!rect.IsZero()) {
         if (!has_checked_box_in_range) {
           has_checked_box_in_range = true;
           rects.clear();
         }
         rects.push_back(LocalToAbsoluteQuad(rect).EnclosingBoundingBox());
       }
     } else if (!has_checked_box_in_range) {
       // FIXME: This code is wrong. It's converting local to absolute twice.
       // http://webkit.org/b/65722
-      FloatRect rect =
-          LocalQuadForTextBox(box, start, end, use_selection_height);
+      FloatRect rect = LocalQuadForTextBox(box, start, end);
       if (!rect.IsZero())
         rects.push_back(LocalToAbsoluteQuad(rect).EnclosingBoundingBox());
     }
   }
 }
 
 static IntRect EllipsisRectForBox(InlineTextBox* box,
                                   unsigned start_pos,
                                   unsigned end_pos) {
   if (!box)
@@ skipping 84 matching lines @@
     // past it
     if (start <= box->Start() && box->end() < end) {
       LayoutRect r(box->FrameRect());
       if (!has_checked_box_in_range) {
         has_checked_box_in_range = true;
         quads.clear();
       }
       quads.push_back(LocalToAbsoluteQuad(FloatRect(r)));
     } else if ((box->Start() <= start && start <= box->end()) ||
                (box->Start() < end && end <= box->end())) {
-      FloatRect rect = LocalQuadForTextBox(box, start, end, false);
+      FloatRect rect = LocalQuadForTextBox(box, start, end);
       if (!rect.IsZero()) {
         if (!has_checked_box_in_range) {
           has_checked_box_in_range = true;
           quads.clear();
         }
         quads.push_back(LocalToAbsoluteQuad(rect));
       }
     } else if (!has_checked_box_in_range) {
       // consider when the offset of range is area of leading or trailing
       // whitespace
-      FloatRect rect = LocalQuadForTextBox(box, start, end, false);
+      FloatRect rect = LocalQuadForTextBox(box, start, end);
       if (!rect.IsZero())
         quads.push_back(LocalToAbsoluteQuad(rect).EnclosingBoundingBox());
     }
   }
 }
 
 FloatRect LayoutText::LocalBoundingBoxRectForAccessibility() const {
   FloatRect result;
   Vector<FloatQuad> quads;
   this->Quads(quads, LayoutText::kClipToEllipsis, LayoutText::kLocalQuads);
@@ skipping 1576 matching lines @@
   LayoutRect rect = LayoutRect(
       IntRect(FirstRunX(), FirstRunY(), lines_box.Width(), lines_box.Height()));
   LayoutBlock* block = ContainingBlock();
   if (block && HasTextBoxes())
     block->AdjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink