Rename some functions about layout locations

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

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2407 matching lines @@
 
 void LayoutBlockFlow::computeSelfHitTestRects(
     Vector<LayoutRect>& rects,
     const LayoutPoint& layerOffset) const {
   LayoutBlock::computeSelfHitTestRects(rects, layerOffset);
 
   if (!hasHorizontalLayoutOverflow() && !hasVerticalLayoutOverflow())
     return;
 
   for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
-    LayoutUnit top = std::max<LayoutUnit>(curr->lineTop(), curr->top());
+    LayoutUnit top = std::max<LayoutUnit>(curr->lineTop(), curr->y());
     LayoutUnit bottom =
-        std::min<LayoutUnit>(curr->lineBottom(), curr->top() + curr->height());
+        std::min<LayoutUnit>(curr->lineBottom(), curr->y() + curr->height());
     LayoutRect rect(layerOffset.x() + curr->x(), layerOffset.y() + top,
                     curr->width(), bottom - top);
     // It's common for this rect to be entirely contained in our box, so exclude
     // that simple case.
     if (!rect.isEmpty() && (rects.isEmpty() || !rects[0].contains(rect)))
       rects.append(rect);
   }
 }
 
 void LayoutBlockFlow::absoluteRects(
@@ skipping 2064 matching lines @@
       rects.append(rect);
     }
   }
 
   LayoutBlock::addOutlineRects(rects, additionalOffset, includeBlockOverflows);
 
   if (includeBlockOverflows == IncludeBlockVisualOverflow &&
       !hasOverflowClip() && !hasControlClip()) {
     for (RootInlineBox* curr = firstRootBox(); curr;
          curr = curr->nextRootBox()) {
-      LayoutUnit top = std::max<LayoutUnit>(curr->lineTop(), curr->top());
-      LayoutUnit bottom = std::min<LayoutUnit>(curr->lineBottom(),
-                                               curr->top() + curr->height());
+      LayoutUnit top = std::max<LayoutUnit>(curr->lineTop(), curr->y());
+      LayoutUnit bottom =
+          std::min<LayoutUnit>(curr->lineBottom(), curr->y() + curr->height());
       LayoutRect rect(additionalOffset.x() + curr->x(),
                       additionalOffset.y() + top, curr->width(), bottom - top);
       if (!rect.isEmpty())
         rects.append(rect);
     }
   }
 
   if (inlineElementContinuation)
     inlineElementContinuation->addOutlineRects(
         rects, additionalOffset +
@@ skipping 10 matching lines @@
   return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 void LayoutBlockFlow::invalidateDisplayItemClients(
     PaintInvalidationReason invalidationReason) const {
   BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
       invalidationReason);
 }
 
 }  // namespace blink