Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 2536453002: Rename some functions about layout locations (Closed)
Patch Set: Rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
index dd29fed7bae60dbf585a4a6250e217eff5ff7fa2..c642ec88a47a0df38f3b2fdb82a4712b5ca6d786 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -2425,9 +2425,9 @@ void LayoutBlockFlow::computeSelfHitTestRects(
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
@@ -4512,9 +4512,9 @@ void LayoutBlockFlow::addOutlineRects(
!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())
« no previous file with comments | « third_party/WebKit/Source/core/layout/InlineTextBoxTest.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698