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

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

Issue 1820483002: Untangle multicol coordinate space conversion from offsetFromContainer(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address code review comment. Created 4 years, 9 months 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 9adf44adfb0b1e491f5b03de4f17c768d6f6f75b..5e9f43ba01fc9cae8f20364b38a484b7335108d0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1707,7 +1707,7 @@ void LayoutBox::mapAncestorToLocal(const LayoutBoxModelObject* ancestor, Transfo
LayoutBoxModelObject::mapAncestorToLocal(ancestor, transformState, mode);
}
-LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o, const LayoutPoint& point, bool* offsetDependsOnPoint) const
+LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o) const
{
ASSERT(o == container());
@@ -1716,15 +1716,6 @@ LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o, const LayoutPoi
offset += offsetForInFlowPosition();
offset += topLeftLocationOffset();
- if (o->isLayoutFlowThread()) {
- // So far the point has been in flow thread coordinates (i.e. as if everything in
- // the fragmentation context lived in one tall single column). Convert it to a
- // visual point now.
- LayoutPoint pointInContainer = point + offset;
- offset += o->columnOffset(pointInContainer);
- if (offsetDependsOnPoint)
- *offsetDependsOnPoint = true;
- }
if (o->hasOverflowClip())
offset -= toLayoutBox(o)->scrolledContentOffset();
« 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