| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 { | 223 { |
| 224 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi
calTop, fixedOffset, logicalHeight), applyTextIndent); | 224 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi
calTop, fixedOffset, logicalHeight), applyTextIndent); |
| 225 } | 225 } |
| 226 | 226 |
| 227 virtual RenderObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/,
SubtreeLayoutScope&); | 227 virtual RenderObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/,
SubtreeLayoutScope&); |
| 228 virtual bool updateLogicalWidthAndColumnWidth() override; | 228 virtual bool updateLogicalWidthAndColumnWidth() override; |
| 229 | 229 |
| 230 void setLogicalLeftForChild(RenderBox* child, LayoutUnit logicalLeft); | 230 void setLogicalLeftForChild(RenderBox* child, LayoutUnit logicalLeft); |
| 231 void setLogicalTopForChild(RenderBox* child, LayoutUnit logicalTop); | 231 void setLogicalTopForChild(RenderBox* child, LayoutUnit logicalTop); |
| 232 void determineLogicalLeftPositionForChild(RenderBox* child); | 232 void determineLogicalLeftPositionForChild(RenderBox* child); |
| 233 void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bo
ol& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight); |
| 233 | 234 |
| 234 private: | 235 private: |
| 235 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S
ubtreeLayoutScope&); | 236 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S
ubtreeLayoutScope&); |
| 236 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU
nit beforeEdge, LayoutUnit afterEdge); | 237 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU
nit beforeEdge, LayoutUnit afterEdge); |
| 237 | 238 |
| 238 void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFlo
atLogicalBottom); | 239 void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFlo
atLogicalBottom); |
| 239 void adjustPositionedBlock(RenderBox* child, const MarginInfo&); | 240 void adjustPositionedBlock(RenderBox* child, const MarginInfo&); |
| 240 void adjustFloatingBlock(const MarginInfo&); | 241 void adjustFloatingBlock(const MarginInfo&); |
| 241 | 242 |
| 242 LayoutPoint computeLogicalLocationForFloat(const FloatingObject*, LayoutUnit
logicalTopOffset) const; | 243 LayoutPoint computeLogicalLocationForFloat(const FloatingObject*, LayoutUnit
logicalTopOffset) const; |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 MultiColumnFlowThread, | 286 MultiColumnFlowThread, |
| 286 PagedFlowThread | 287 PagedFlowThread |
| 287 }; | 288 }; |
| 288 | 289 |
| 289 FlowThreadType flowThreadType(const RenderStyle*); | 290 FlowThreadType flowThreadType(const RenderStyle*); |
| 290 | 291 |
| 291 RenderMultiColumnFlowThread* createMultiColumnFlowThread(FlowThreadType); | 292 RenderMultiColumnFlowThread* createMultiColumnFlowThread(FlowThreadType); |
| 292 void createOrDestroyMultiColumnFlowThreadIfNeeded(const RenderStyle* oldStyl
e); | 293 void createOrDestroyMultiColumnFlowThreadIfNeeded(const RenderStyle* oldStyl
e); |
| 293 | 294 |
| 294 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*,
BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float&
availableLogicalWidth, unsigned expansionOpportunityCount); | 295 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*,
BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float&
availableLogicalWidth, unsigned expansionOpportunityCount); |
| 295 void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bo
ol& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight); | |
| 296 bool shouldRelayoutForPagination(LayoutUnit& pageLogicalHeight, LayoutUnit l
ayoutOverflowLogicalBottom) const; | 296 bool shouldRelayoutForPagination(LayoutUnit& pageLogicalHeight, LayoutUnit l
ayoutOverflowLogicalBottom) const; |
| 297 void setColumnCountAndHeight(unsigned count, LayoutUnit pageLogicalHeight); | 297 void setColumnCountAndHeight(unsigned count, LayoutUnit pageLogicalHeight); |
| 298 | 298 |
| 299 bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData
->m_lineBreakToAvoidWidow >= 0; } | 299 bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData
->m_lineBreakToAvoidWidow >= 0; } |
| 300 void clearShouldBreakAtLineToAvoidWidow() const; | 300 void clearShouldBreakAtLineToAvoidWidow() const; |
| 301 int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBr
eakToAvoidWidow : -1; } | 301 int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBr
eakToAvoidWidow : -1; } |
| 302 void setBreakAtLineToAvoidWidow(int); | 302 void setBreakAtLineToAvoidWidow(int); |
| 303 void clearDidBreakAtLineToAvoidWidow(); | 303 void clearDidBreakAtLineToAvoidWidow(); |
| 304 void setDidBreakAtLineToAvoidWidow(); | 304 void setDidBreakAtLineToAvoidWidow(); |
| 305 bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m
_didBreakAtLineToAvoidWidow; } | 305 bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m
_didBreakAtLineToAvoidWidow; } |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 | 500 |
| 501 // END METHODS DEFINED IN RenderBlockLineLayout | 501 // END METHODS DEFINED IN RenderBlockLineLayout |
| 502 | 502 |
| 503 }; | 503 }; |
| 504 | 504 |
| 505 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 505 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
| 506 | 506 |
| 507 } // namespace blink | 507 } // namespace blink |
| 508 | 508 |
| 509 #endif // RenderBlockFlow_h | 509 #endif // RenderBlockFlow_h |
| OLD | NEW |