OLD | NEW |
---|---|
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 Loading... | |
205 virtual bool avoidsFloats() const override; | 205 virtual bool avoidsFloats() const override; |
206 | 206 |
207 using RenderBoxModelObject::moveChildrenTo; | 207 using RenderBoxModelObject::moveChildrenTo; |
208 virtual void moveChildrenTo(RenderBoxModelObject* toBoxModelObject, RenderOb ject* startChild, RenderObject* endChild, RenderObject* beforeChild, bool fullRe moveInsert = false) override; | 208 virtual void moveChildrenTo(RenderBoxModelObject* toBoxModelObject, RenderOb ject* startChild, RenderObject* endChild, RenderObject* beforeChild, bool fullRe moveInsert = false) override; |
209 | 209 |
210 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con st | 210 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con st |
211 { | 211 { |
212 if (isHorizontalWritingMode()) | 212 if (isHorizontalWritingMode()) |
213 return child->x() + child->renderer()->marginLeft(); | 213 return child->x() + child->renderer()->marginLeft(); |
214 | 214 |
215 return child->x() + marginBeforeForChild(child->renderer()); | 215 return child->x() + marginBeforeForChild(*(child->renderer())); |
Julien - ping for review
2014/11/26 18:52:35
We should make FloatingObject return a reference t
Sunil Ratnu
2014/11/27 12:02:54
Lets keep FloatingObject conversion in a separate
| |
216 } | 216 } |
217 | 217 |
218 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con st | 218 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con st |
219 { | 219 { |
220 if (isHorizontalWritingMode()) | 220 if (isHorizontalWritingMode()) |
221 return child->y() + marginBeforeForChild(child->renderer()); | 221 return child->y() + marginBeforeForChild(*(child->renderer())); |
222 | 222 |
223 return child->y() + child->renderer()->marginTop(); | 223 return child->y() + child->renderer()->marginTop(); |
224 } | 224 } |
225 | 225 |
226 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay outPoint&) const; | 226 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay outPoint&) const; |
227 | 227 |
228 protected: | 228 protected: |
229 void rebuildFloatsFromIntruding(); | 229 void rebuildFloatsFromIntruding(); |
230 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); | 230 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); |
231 | 231 |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
522 | 522 |
523 // END METHODS DEFINED IN RenderBlockLineLayout | 523 // END METHODS DEFINED IN RenderBlockLineLayout |
524 | 524 |
525 }; | 525 }; |
526 | 526 |
527 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 527 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
528 | 528 |
529 } // namespace blink | 529 } // namespace blink |
530 | 530 |
531 #endif // RenderBlockFlow_h | 531 #endif // RenderBlockFlow_h |
OLD | NEW |