Introduce LocalCaretRect for refactoring Local{Caret,Selection}RectPosition()

third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 56 matching lines @@
   // DocumentLifeCycle::LayoutClean but caretRendersInsideNode above can
   // layout. Thus |node->layoutObject()| can be changed then this is bad
   // design. We should make caret painting algorithm clean.
   CHECK_EQ(layout_object, node->GetLayoutObject())
       << "Layout tree should not changed";
   return painted_by_block ? ToLayoutBlock(layout_object)
                           : layout_object->ContainingBlock();
 }
 
 static LayoutRect MapCaretRectToCaretPainter(
-    LayoutItem caret_layout_item,
-    LayoutBlockItem caret_painter_item,
-    const LayoutRect& passed_caret_rect) {
+    const LayoutBlockItem& caret_painter_item,
+    const LocalCaretRect& caret_rect) {
   // FIXME: This shouldn't be called on un-rooted subtrees.
   // FIXME: This should probably just use mapLocalToAncestor.
   // Compute an offset between the caretLayoutItem and the caretPainterItem.
 
+  LayoutItem caret_layout_item = LayoutItem(caret_rect.layout_object);
   DCHECK(caret_layout_item.IsDescendantOf(caret_painter_item));
 
-  LayoutRect caret_rect = passed_caret_rect;
+  LayoutRect result_rect = caret_rect.rect;
+  caret_painter_item.FlipForWritingMode(result_rect);
   while (caret_layout_item != caret_painter_item) {
     LayoutItem container_item = caret_layout_item.Container();
     if (container_item.IsNull())
       return LayoutRect();
-    caret_rect.Move(caret_layout_item.OffsetFromContainer(container_item));
+    result_rect.Move(caret_layout_item.OffsetFromContainer(container_item));
     caret_layout_item = container_item;
   }
-  return caret_rect;
+  return result_rect;
 }
 
 LayoutRect CaretDisplayItemClient::ComputeCaretRect(
     const PositionWithAffinity& caret_position) {
   if (caret_position.IsNull())
     return LayoutRect();
 
   DCHECK(caret_position.AnchorNode()->GetLayoutObject());
 
   // First compute a rect local to the layoutObject at the selection start.
-  LayoutObject* layout_object;
-  const LayoutRect& caret_local_rect =
-      LocalCaretRectOfPosition(caret_position, layout_object);
+  const LocalCaretRect& caret_rect = LocalCaretRectOfPosition(caret_position);
 
   // Get the layoutObject that will be responsible for painting the caret
   // (which is either the layoutObject we just found, or one of its containers).
-  LayoutBlockItem caret_painter_item =
+  const LayoutBlockItem caret_painter_item =
       LayoutBlockItem(CaretLayoutBlock(caret_position.AnchorNode()));
-  LayoutRect caret_local_rect_with_writing_mode = caret_local_rect;
-  caret_painter_item.FlipForWritingMode(caret_local_rect_with_writing_mode);
-  return MapCaretRectToCaretPainter(LayoutItem(layout_object),
-                                    caret_painter_item,
-                                    caret_local_rect_with_writing_mode);
+  return MapCaretRectToCaretPainter(caret_painter_item, caret_rect);
 }
 
 void CaretDisplayItemClient::ClearPreviousVisualRect(const LayoutBlock& block) {
   if (block == layout_block_)
     visual_rect_ = LayoutRect();
   if (block == previous_layout_block_)
     visual_rect_in_previous_layout_block_ = LayoutRect();
 }
 
 void CaretDisplayItemClient::LayoutBlockWillBeDestroyed(
@@ skipping 173 matching lines @@
 
 String CaretDisplayItemClient::DebugName() const {
   return "Caret";
 }
 
 LayoutRect CaretDisplayItemClient::VisualRect() const {
   return visual_rect_;
 }
 
 }  // namespace blink