| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*,
BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float&
availableLogicalWidth, unsigned expansionOpportunityCount); | 107 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*,
BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float&
availableLogicalWidth, unsigned expansionOpportunityCount); |
| 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 GapRects inlineSelectionGaps(RenderBlock* rootBlock, const LayoutPoint& root
BlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, | |
| 118 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& las
tLogicalRight, const PaintInfo*); | |
| 119 | |
| 120 protected: | 117 protected: |
| 121 virtual void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&, Layo
utUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom,
LayoutUnit beforeEdge, LayoutUnit afterEdge); | 118 virtual void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&, Layo
utUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom,
LayoutUnit beforeEdge, LayoutUnit afterEdge); |
| 122 | 119 |
| 123 virtual bool updateLogicalWidthAndColumnWidth() override; | 120 virtual bool updateLogicalWidthAndColumnWidth() override; |
| 124 | 121 |
| 125 void determineLogicalLeftPositionForChild(RenderBox* child); | 122 void determineLogicalLeftPositionForChild(RenderBox* child); |
| 126 | 123 |
| 127 private: | 124 private: |
| 128 void layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); | 125 void layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); |
| 129 | 126 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 155 protected: | 152 protected: |
| 156 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 | 153 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 |
| 157 friend class LineBreaker; | 154 friend class LineBreaker; |
| 158 }; | 155 }; |
| 159 | 156 |
| 160 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 157 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
| 161 | 158 |
| 162 } // namespace blink | 159 } // namespace blink |
| 163 | 160 |
| 164 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_ | 161 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_ |
| OLD | NEW |