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

Unified Diff: Source/core/layout/LayoutBlockFlow.h

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 5 years, 10 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: Source/core/layout/LayoutBlockFlow.h
diff --git a/Source/core/layout/LayoutBlockFlow.h b/Source/core/layout/LayoutBlockFlow.h
index 664c8b8e09927c4f692cfe856bbe712433002293..2f818bcf8bd0fc9c6bbe75e2d8a97ecebcbacd54 100644
--- a/Source/core/layout/LayoutBlockFlow.h
+++ b/Source/core/layout/LayoutBlockFlow.h
@@ -212,28 +212,28 @@ public:
LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) const
{
if (isHorizontalWritingMode())
- return child->x() + child->renderer()->marginLeft();
+ return child->x() + child->layoutObject()->marginLeft();
- return child->x() + marginBeforeForChild(*(child->renderer()));
+ return child->x() + marginBeforeForChild(*(child->layoutObject()));
}
LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) const
{
if (isHorizontalWritingMode())
- return child->y() + marginBeforeForChild(*(child->renderer()));
+ return child->y() + marginBeforeForChild(*(child->layoutObject()));
- return child->y() + child->renderer()->marginTop();
+ return child->y() + child->layoutObject()->marginTop();
}
LayoutSize positionForFloatIncludingMargin(const FloatingObject* child) const
{
if (isHorizontalWritingMode()) {
- return LayoutSize(child->x() + child->renderer()->marginLeft(),
- child->y() + marginBeforeForChild(*(child->renderer())));
+ return LayoutSize(child->x() + child->layoutObject()->marginLeft(),
+ child->y() + marginBeforeForChild(*(child->layoutObject())));
}
- return LayoutSize(child->x() + marginBeforeForChild(*(child->renderer())),
- child->y() + child->renderer()->marginTop());
+ return LayoutSize(child->x() + marginBeforeForChild(*(child->layoutObject())),
+ child->y() + child->layoutObject()->marginTop());
}
LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const LayoutPoint&) const;

Powered by Google App Engine
This is Rietveld 408576698