| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 | 108 |
| 109 void setStaticInlinePositionForChild(RenderBox*, LayoutUnit inlinePosition); | 109 void setStaticInlinePositionForChild(RenderBox*, LayoutUnit inlinePosition); |
| 110 void updateStaticInlinePositionForChild(RenderBox*); | 110 void updateStaticInlinePositionForChild(RenderBox*); |
| 111 | 111 |
| 112 static bool shouldSkipCreatingRunsForObject(RenderObject* obj) | 112 static bool shouldSkipCreatingRunsForObject(RenderObject* obj) |
| 113 { | 113 { |
| 114 return obj->isOutOfFlowPositioned() && !obj->style()->isOriginalDisplayI
nlineType() && !obj->container()->isRenderInline(); | 114 return obj->isOutOfFlowPositioned() && !obj->style()->isOriginalDisplayI
nlineType() && !obj->container()->isRenderInline(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 protected: | 117 protected: |
| 118 virtual void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&, Layo
utUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom,
LayoutUnit beforeEdge, LayoutUnit afterEdge); | 118 virtual void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&, Layo
utUnit beforeEdge, LayoutUnit afterEdge); |
| 119 | 119 |
| 120 virtual bool updateLogicalWidthAndColumnWidth() override; | 120 virtual bool updateLogicalWidthAndColumnWidth() override; |
| 121 | 121 |
| 122 void determineLogicalLeftPositionForChild(RenderBox* child); | 122 void determineLogicalLeftPositionForChild(RenderBox* child); |
| 123 | 123 |
| 124 private: | 124 private: |
| 125 void layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); | 125 void layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); |
| 126 | 126 |
| 127 void layoutBlockChild(RenderBox* child); | 127 void layoutBlockChild(RenderBox* child); |
| 128 void adjustPositionedBlock(RenderBox* child); | 128 void adjustPositionedBlock(RenderBox* child); |
| 129 | 129 |
| 130 RootInlineBox* createRootInlineBox(); | 130 RootInlineBox* createRootInlineBox(); |
| 131 | 131 |
| 132 public: | 132 public: |
| 133 struct FloatWithRect { | 133 struct FloatWithRect { |
| 134 FloatWithRect(RenderBox* f) | 134 FloatWithRect(RenderBox* f) |
| 135 : object(f) | 135 : object(f) |
| 136 , rect(LayoutRect(f->x() - f->marginLeft(), f->y() - f->marginTop(),
f->width() + f->marginWidth(), f->height() + f->marginHeight())) | 136 , rect(LayoutRect(f->x() - f->marginLeft(), f->y() - f->marginTop(),
f->width() + f->marginWidth(), f->height() + f->marginHeight())) |
| 137 , everHadLayout(f->everHadLayout()) | 137 , everHadLayout(f->everHadLayout()) |
| 138 { | 138 { |
| 139 } | 139 } |
| 140 | 140 |
| 141 RenderBox* object; | 141 RenderBox* object; |
| 142 LayoutRect rect; | 142 LayoutRect rect; |
| 143 bool everHadLayout; | 143 bool everHadLayout; |
| 144 }; | 144 }; |
| 145 | 145 |
| 146 private: | |
| 147 LayoutUnit m_paintInvalidationLogicalTop; | |
| 148 LayoutUnit m_paintInvalidationLogicalBottom; | |
| 149 | |
| 150 protected: | 146 protected: |
| 151 friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos
itionNewFloatOnLine, if we move those out from the private scope/add a helper to
LineBreaker, we can remove this friend | 147 friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos
itionNewFloatOnLine, if we move those out from the private scope/add a helper to
LineBreaker, we can remove this friend |
| 152 friend class LineBreaker; | 148 friend class LineBreaker; |
| 153 }; | 149 }; |
| 154 | 150 |
| 155 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 151 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
| 156 | 152 |
| 157 } // namespace blink | 153 } // namespace blink |
| 158 | 154 |
| 159 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_ | 155 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_ |
| OLD | NEW |