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

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

Issue 2268823006: [Layout API] Use ownerLayoutItem() in LayoutView (part 2) (Closed)
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/api/LayoutBoxItem.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutView.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutView.cpp b/third_party/WebKit/Source/core/layout/LayoutView.cpp
index b8bd622890602aaf61762088c988a4fdd0bb4277..2ab77fee3e6dd8a9a0adc76abc500466123b2aa0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutView.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutView.cpp
@@ -321,7 +321,8 @@ void LayoutView::mapLocalToAncestor(const LayoutBoxModelObject* ancestor, Transf
return;
if (mode & TraverseDocumentBoundaries) {
- if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) {
+ LayoutPartItem parentDocLayoutItem = frame()->ownerLayoutItem();
+ if (!parentDocLayoutItem.isNull()) {
if (!(mode & InputIsInFrameCoordinates)) {
transformState.move(-frame()->view()->scrollOffset());
} else {
@@ -329,9 +330,9 @@ void LayoutView::mapLocalToAncestor(const LayoutBoxModelObject* ancestor, Transf
mode &= ~InputIsInFrameCoordinates;
}
- transformState.move(parentDocLayoutObject->contentBoxOffset());
+ transformState.move(parentDocLayoutItem.contentBoxOffset());
- parentDocLayoutObject->mapLocalToAncestor(ancestor, transformState, mode);
+ parentDocLayoutItem.mapLocalToAncestor(ancestor, transformState, mode);
}
}
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/api/LayoutBoxItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698