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

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

Issue 2300703003: [Layout API] Remove ownerLayoutObject() from layout/LayoutView (Closed)
Patch Set: Created 4 years, 3 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 | no next file » | 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 c298b1940ca650ece4b3089991296fb552413d48..0112d60920e2ca0e9e34354409954356702caf16 100644
--- a/third_party/WebKit/Source/core/layout/LayoutView.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutView.cpp
@@ -32,6 +32,7 @@
#include "core/layout/LayoutMedia.h"
#include "core/layout/LayoutPart.h"
#include "core/layout/ViewFragmentationContext.h"
+#include "core/layout/api/LayoutAPIShim.h"
#include "core/layout/compositing/PaintLayerCompositor.h"
#include "core/page/Page.h"
#include "core/paint/PaintLayer.h"
@@ -350,7 +351,7 @@ const LayoutObject* LayoutView::pushMappingToContainer(const LayoutBoxModelObjec
}
if (geometryMap.getMapCoordinatesFlags() & TraverseDocumentBoundaries) {
- if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) {
+ if (LayoutPart* parentDocLayoutObject = toLayoutPart(LayoutAPIShim::layoutObjectFrom(frame()->ownerLayoutItem()))) {
offset = -LayoutSize(m_frameView->scrollOffset());
offset += parentDocLayoutObject->contentBoxOffset();
container = parentDocLayoutObject;
@@ -378,7 +379,7 @@ void LayoutView::mapAncestorToLocal(const LayoutBoxModelObject* ancestor, Transf
return;
if (mode & TraverseDocumentBoundaries) {
- if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) {
+ if (LayoutPart* parentDocLayoutObject = toLayoutPart(LayoutAPIShim::layoutObjectFrom(frame()->ownerLayoutItem()))) {
// A LayoutView is a containing block for fixed-position elements, so don't carry this state across frames.
parentDocLayoutObject->mapAncestorToLocal(ancestor, transformState, mode & ~IsFixed);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698