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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.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/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 3bb85b57f829de62d28bb7af3e616142577908f7..604faddf1545818dbbb2351d6a35125ef43d1c97 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1972,7 +1972,7 @@ LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o) const {
if (isInFlowPositioned())
offset += offsetForInFlowPosition();
- offset += topLeftLocationOffset();
+ offset += physicalLocationOffset();
if (o->hasOverflowClip())
offset -= toLayoutBox(o)->scrolledContentOffset();
@@ -2025,7 +2025,7 @@ void LayoutBox::positionLineBox(InlineBox* box) {
box->remove(DontMarkLineBoxes);
box->destroy();
} else if (isAtomicInlineLevel()) {
- setLocationAndUpdateOverflowControlsIfNeeded(box->topLeft());
+ setLocationAndUpdateOverflowControlsIfNeeded(box->location());
setInlineBoxWrapper(box);
}
}
@@ -2319,18 +2319,19 @@ bool LayoutBox::mapToVisualRectInAncestorSpace(
}
LayoutPoint topLeft = rect.location();
if (container->isBox()) {
- topLeft.moveBy(topLeftLocation(toLayoutBox(container)));
+ topLeft.moveBy(physicalLocation(toLayoutBox(container)));
// If the row is the ancestor, however, add its offset back in. In effect,
// this passes from the joint <td> / <tr> coordinate space to the parent
// space, then back to <tr> / <td>.
- if (tableRowContainer)
+ if (tableRowContainer) {
topLeft.moveBy(
- -tableRowContainer->topLeftLocation(toLayoutBox(container)));
+ -tableRowContainer->physicalLocation(toLayoutBox(container)));
+ }
} else if (container->isRuby()) {
// TODO(wkorman): Generalize Ruby specialization and/or document more
// clearly. See the accompanying specialization in
// LayoutInline::mapToVisualRectInAncestorSpace.
- topLeft.moveBy(topLeftLocation());
+ topLeft.moveBy(physicalLocation());
} else {
topLeft.moveBy(location());
}
@@ -5156,11 +5157,11 @@ LayoutRect LayoutBox::visualOverflowRect() const {
}
LayoutUnit LayoutBox::offsetLeft(const Element* parent) const {
- return adjustedPositionRelativeTo(topLeftLocation(), parent).x();
+ return adjustedPositionRelativeTo(physicalLocation(), parent).x();
}
LayoutUnit LayoutBox::offsetTop(const Element* parent) const {
- return adjustedPositionRelativeTo(topLeftLocation(), parent).y();
+ return adjustedPositionRelativeTo(physicalLocation(), parent).y();
}
LayoutPoint LayoutBox::flipForWritingModeForChild(
@@ -5189,7 +5190,7 @@ LayoutBox* LayoutBox::locationContainer() const {
return toLayoutBox(container);
}
-LayoutPoint LayoutBox::topLeftLocation(
+LayoutPoint LayoutBox::physicalLocation(
const LayoutBox* flippedBlocksContainer) const {
const LayoutBox* containerBox;
if (flippedBlocksContainer) {
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698