Rename some functions about layout locations

third_party/WebKit/Source/core/layout/line/InlineBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 195 matching lines @@
     LineLayoutBox(getLineLayoutItem()).setInlineBoxWrapper(nullptr);
 }
 
 void InlineBox::attachLine() {
   m_bitfields.setExtracted(false);
   if (getLineLayoutItem().isBox())
     LineLayoutBox(getLineLayoutItem()).setInlineBoxWrapper(this);
 }
 
 void InlineBox::move(const LayoutSize& delta) {
-  m_topLeft.move(delta);
+  m_location.move(delta);
 
   if (getLineLayoutItem().isAtomicInlineLevel())
     LineLayoutBox(getLineLayoutItem()).move(delta.width(), delta.height());
 
   setLineLayoutItemShouldDoFullPaintInvalidationIfNeeded();
 }
 
 void InlineBox::paint(const PaintInfo& paintInfo,
                       const LayoutPoint& paintOffset,
                       LayoutUnit /* lineTop */,
@@ skipping 79 matching lines @@
   return getLineLayoutItem().getSelectionState();
 }
 
 bool InlineBox::canAccommodateEllipsis(bool ltr,
                                        int blockEdge,
                                        int ellipsisWidth) const {
   // Non-atomic inline-level elements can always accommodate an ellipsis.
   if (!getLineLayoutItem().isAtomicInlineLevel())
     return true;
 
-  IntRect boxRect(left().toInt(), 0, m_logicalWidth.toInt(), 10);
+  IntRect boxRect(x().toInt(), 0, m_logicalWidth.toInt(), 10);
   IntRect ellipsisRect(ltr ? blockEdge - ellipsisWidth : blockEdge, 0,
                        ellipsisWidth, 10);
   return !(boxRect.intersects(ellipsisRect));
 }
 
 LayoutUnit InlineBox::placeEllipsisBox(bool,
                                        LayoutUnit,
                                        LayoutUnit,
                                        LayoutUnit,
                                        LayoutUnit& truncatedWidth,
                                        bool&) {
   // Use -1 to mean "we didn't set the position."
   truncatedWidth += logicalWidth();
   return LayoutUnit(-1);
 }
 
 void InlineBox::clearKnownToHaveNoOverflow() {
   m_bitfields.setKnownToHaveNoOverflow(false);
   if (parent() && parent()->knownToHaveNoOverflow())
     parent()->clearKnownToHaveNoOverflow();
 }
 
-LayoutPoint InlineBox::locationIncludingFlipping() const {
-  return logicalPositionToPhysicalPoint(m_topLeft, size());
-}
-
-LayoutPoint InlineBox::logicalPositionToPhysicalPoint(
-    const LayoutPoint& point,
-    const LayoutSize& size) const {
-  if (!UNLIKELY(getLineLayoutItem().hasFlippedBlocksWritingMode()))
-    return LayoutPoint(point.x(), point.y());
-
-  LineLayoutBlockFlow block = root().block();
-  if (block.style()->isHorizontalWritingMode())
-    return LayoutPoint(point.x(),

[chrishtr, 2016/11/28 15:13:29]

This old code looks backward to me now...why is it messing with the y coordinate
in horizontal mode, rather
than x? Was this a bug?

[Xianzhu, 2016/11/28 18:42:36]

This seems for horizontal-bt which is not supported elsewhere.

-                       block.size().height() - size.height() - point.y());
-
-  return LayoutPoint(block.size().width() - size.width() - point.x(),
-                     point.y());
+LayoutPoint InlineBox::physicalLocation() const {
+  LayoutRect rect(location(), size());
+  flipForWritingMode(rect);
+  return rect.location();
 }
 
 void InlineBox::logicalRectToPhysicalRect(LayoutRect& current) const {

[chrishtr, 2016/11/28 15:13:29]

Please unittest this.

[Xianzhu, 2016/11/28 18:42:36]

Done.

-  if (isHorizontal() && !getLineLayoutItem().hasFlippedBlocksWritingMode())
-    return;
-
-  if (!isHorizontal()) {
+  if (!isHorizontal())
     current = current.transposedRect();
-  }
-  current.setLocation(
-      logicalPositionToPhysicalPoint(current.location(), current.size()));
-  return;
+  flipForWritingMode(current);
 }
 
 void InlineBox::flipForWritingMode(FloatRect& rect) const {
   if (!UNLIKELY(getLineLayoutItem().hasFlippedBlocksWritingMode()))
     return;
   root().block().flipForWritingMode(rect);
 }
 
 FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point) const {
   if (!UNLIKELY(getLineLayoutItem().hasFlippedBlocksWritingMode()))
@@ skipping 41 matching lines @@
 }
 
 void showLineTree(const blink::InlineBox* b) {
   if (b)
     b->showLineTreeForThis();
   else
     fprintf(stderr, "Cannot showLineTree for (nil) InlineBox.\n");
 }
 
 #endif