| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 return LayoutSize(child->x() + child->layoutObject()->marginLeft(), | 230 return LayoutSize(child->x() + child->layoutObject()->marginLeft(), |
| 231 child->y() + marginBeforeForChild(*(child->layoutObject()))); | 231 child->y() + marginBeforeForChild(*(child->layoutObject()))); |
| 232 } | 232 } |
| 233 | 233 |
| 234 return LayoutSize(child->x() + marginBeforeForChild(*(child->layoutObjec
t())), | 234 return LayoutSize(child->x() + marginBeforeForChild(*(child->layoutObjec
t())), |
| 235 child->y() + child->layoutObject()->marginTop()); | 235 child->y() + child->layoutObject()->marginTop()); |
| 236 } | 236 } |
| 237 | 237 |
| 238 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay
outPoint&) const; | 238 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay
outPoint&) const; |
| 239 | 239 |
| 240 virtual const char* name() const override; | 240 virtual const char* name() const override { return "LayoutBlockFlow"; } |
| 241 | 241 |
| 242 protected: | 242 protected: |
| 243 void rebuildFloatsFromIntruding(); | 243 void rebuildFloatsFromIntruding(); |
| 244 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati
onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); | 244 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati
onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); |
| 245 | 245 |
| 246 void createFloatingObjects(); | 246 void createFloatingObjects(); |
| 247 | 247 |
| 248 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle)
override; | 248 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle)
override; |
| 249 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle)
override; | 249 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle)
override; |
| 250 | 250 |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 | 538 |
| 539 // END METHODS DEFINED IN LayoutBlockFlowLine | 539 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 540 | 540 |
| 541 }; | 541 }; |
| 542 | 542 |
| 543 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 543 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 544 | 544 |
| 545 } // namespace blink | 545 } // namespace blink |
| 546 | 546 |
| 547 #endif // LayoutBlockFlow_h | 547 #endif // LayoutBlockFlow_h |
| OLD | NEW |