Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: Source/core/layout/LayoutBlockFlow.h

Issue 1158183006: Remove the old multicol implementation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase master Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 FloatingObject* insertFloatingObject(LayoutBox&); 281 FloatingObject* insertFloatingObject(LayoutBox&);
282 void removeFloatingObject(LayoutBox*); 282 void removeFloatingObject(LayoutBox*);
283 void removeFloatingObjectsBelow(FloatingObject*, int logicalOffset); 283 void removeFloatingObjectsBelow(FloatingObject*, int logicalOffset);
284 284
285 // Called from lineWidth, to position the floats added in the last line. 285 // Called from lineWidth, to position the floats added in the last line.
286 // Returns true if and only if it has positioned any floats. 286 // Returns true if and only if it has positioned any floats.
287 bool positionNewFloats(LineWidth* = 0); 287 bool positionNewFloats(LineWidth* = 0);
288 288
289 LayoutUnit getClearDelta(LayoutBox* child, LayoutUnit yPos); 289 LayoutUnit getClearDelta(LayoutBox* child, LayoutUnit yPos);
290 290
291 bool hasOverhangingFloats() { return parent() && !hasColumns() && containsFl oats() && lowestFloatLogicalBottom() > logicalHeight(); } 291 bool hasOverhangingFloats() { return parent() && containsFloats() && lowestF loatLogicalBottom() > logicalHeight(); }
292 bool hasOverhangingFloat(LayoutBox*); 292 bool hasOverhangingFloat(LayoutBox*);
293 void addIntrudingFloats(LayoutBlockFlow* prev, LayoutUnit xoffset, LayoutUni t yoffset); 293 void addIntrudingFloats(LayoutBlockFlow* prev, LayoutUnit xoffset, LayoutUni t yoffset);
294 void addOverhangingFloats(LayoutBlockFlow* child, bool makeChildPaintOtherFl oats); 294 void addOverhangingFloats(LayoutBlockFlow* child, bool makeChildPaintOtherFl oats);
295 295
296 LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::F loatLeftRight) const; 296 LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::F loatLeftRight) const;
297 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMo de = ShapeOutsideFloatMarginBoxOffset) const; 297 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMo de = ShapeOutsideFloatMarginBoxOffset) const;
298 298
299 virtual bool hitTestFloats(HitTestResult&, const HitTestLocation& locationIn Container, const LayoutPoint& accumulatedOffset) override final; 299 virtual bool hitTestFloats(HitTestResult&, const HitTestLocation& locationIn Container, const LayoutPoint& accumulatedOffset) override final;
300 300
301 virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants) o verride final; 301 virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants) o verride final;
(...skipping 22 matching lines...) Expand all
324 PagedFlowThread 324 PagedFlowThread
325 }; 325 };
326 326
327 FlowThreadType flowThreadType(const ComputedStyle&); 327 FlowThreadType flowThreadType(const ComputedStyle&);
328 328
329 LayoutMultiColumnFlowThread* createMultiColumnFlowThread(FlowThreadType); 329 LayoutMultiColumnFlowThread* createMultiColumnFlowThread(FlowThreadType);
330 void createOrDestroyMultiColumnFlowThreadIfNeeded(const ComputedStyle* oldSt yle); 330 void createOrDestroyMultiColumnFlowThreadIfNeeded(const ComputedStyle* oldSt yle);
331 331
332 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, LayoutUnit& logicalLeft, LayoutUnit& totalLogicalWid th, LayoutUnit& availableLogicalWidth, unsigned expansionOpportunityCount); 332 void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, LayoutUnit& logicalLeft, LayoutUnit& totalLogicalWid th, LayoutUnit& availableLogicalWidth, unsigned expansionOpportunityCount);
333 void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bo ol& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight); 333 void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bo ol& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
334 bool shouldRelayoutForPagination(LayoutUnit& pageLogicalHeight, LayoutUnit l ayoutOverflowLogicalBottom) const;
335 void setColumnCountAndHeight(unsigned count, LayoutUnit pageLogicalHeight);
336 334
337 bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData ->m_lineBreakToAvoidWidow >= 0; } 335 bool shouldBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData ->m_lineBreakToAvoidWidow >= 0; }
338 void clearShouldBreakAtLineToAvoidWidow() const; 336 void clearShouldBreakAtLineToAvoidWidow() const;
339 int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBr eakToAvoidWidow : -1; } 337 int lineBreakToAvoidWidow() const { return m_rareData ? m_rareData->m_lineBr eakToAvoidWidow : -1; }
340 void setBreakAtLineToAvoidWidow(int); 338 void setBreakAtLineToAvoidWidow(int);
341 void clearDidBreakAtLineToAvoidWidow(); 339 void clearDidBreakAtLineToAvoidWidow();
342 void setDidBreakAtLineToAvoidWidow(); 340 void setDidBreakAtLineToAvoidWidow();
343 bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m _didBreakAtLineToAvoidWidow; } 341 bool didBreakAtLineToAvoidWidow() const { return m_rareData && m_rareData->m _didBreakAtLineToAvoidWidow; }
344 342
345 public: 343 public:
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 537
540 // END METHODS DEFINED IN LayoutBlockFlowLine 538 // END METHODS DEFINED IN LayoutBlockFlowLine
541 539
542 }; 540 };
543 541
544 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 542 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
545 543
546 } // namespace blink 544 } // namespace blink
547 545
548 #endif // LayoutBlockFlow_h 546 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698