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

Side by Side 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, 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 void positionSpannerDescendant(LayoutMultiColumnSpannerPlaceholder& child); 205 void positionSpannerDescendant(LayoutMultiColumnSpannerPlaceholder& child);
206 206
207 virtual bool avoidsFloats() const override; 207 virtual bool avoidsFloats() const override;
208 208
209 using LayoutBoxModelObject::moveChildrenTo; 209 using LayoutBoxModelObject::moveChildrenTo;
210 virtual void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutOb ject* startChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRe moveInsert = false) override; 210 virtual void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutOb ject* startChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRe moveInsert = false) override;
211 211
212 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con st 212 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con st
213 { 213 {
214 if (isHorizontalWritingMode()) 214 if (isHorizontalWritingMode())
215 return child->x() + child->renderer()->marginLeft(); 215 return child->x() + child->layoutObject()->marginLeft();
216 216
217 return child->x() + marginBeforeForChild(*(child->renderer())); 217 return child->x() + marginBeforeForChild(*(child->layoutObject()));
218 } 218 }
219 219
220 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con st 220 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con st
221 { 221 {
222 if (isHorizontalWritingMode()) 222 if (isHorizontalWritingMode())
223 return child->y() + marginBeforeForChild(*(child->renderer())); 223 return child->y() + marginBeforeForChild(*(child->layoutObject()));
224 224
225 return child->y() + child->renderer()->marginTop(); 225 return child->y() + child->layoutObject()->marginTop();
226 } 226 }
227 227
228 LayoutSize positionForFloatIncludingMargin(const FloatingObject* child) cons t 228 LayoutSize positionForFloatIncludingMargin(const FloatingObject* child) cons t
229 { 229 {
230 if (isHorizontalWritingMode()) { 230 if (isHorizontalWritingMode()) {
231 return LayoutSize(child->x() + child->renderer()->marginLeft(), 231 return LayoutSize(child->x() + child->layoutObject()->marginLeft(),
232 child->y() + marginBeforeForChild(*(child->renderer()))); 232 child->y() + marginBeforeForChild(*(child->layoutObject())));
233 } 233 }
234 234
235 return LayoutSize(child->x() + marginBeforeForChild(*(child->renderer()) ), 235 return LayoutSize(child->x() + marginBeforeForChild(*(child->layoutObjec t())),
236 child->y() + child->renderer()->marginTop()); 236 child->y() + child->layoutObject()->marginTop());
237 } 237 }
238 238
239 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay outPoint&) const; 239 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay outPoint&) const;
240 240
241 virtual const char* name() const override; 241 virtual const char* name() const override;
242 242
243 protected: 243 protected:
244 void rebuildFloatsFromIntruding(); 244 void rebuildFloatsFromIntruding();
245 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); 245 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge);
246 246
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 // END METHODS DEFINED IN LayoutBlockFlowLine 540 // END METHODS DEFINED IN LayoutBlockFlowLine
541 541
542 }; 542 };
543 543
544 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 544 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
545 545
546 } // namespace blink 546 } // namespace blink
547 547
548 #endif // LayoutBlockFlow_h 548 #endif // LayoutBlockFlow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698