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

Side by Side Diff: Source/core/rendering/RenderMultiColumnBlock.h

Issue 147233002: Remove internal recursion for RenderBlockFlow and RenderMultiColumnBlock layout (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase to apply on latest trunk Created 6 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 28 matching lines...) Expand all
39 39
40 LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; } 40 LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; }
41 41
42 LayoutUnit columnWidth() const { return m_columnWidth; } 42 LayoutUnit columnWidth() const { return m_columnWidth; }
43 unsigned columnCount() const { return m_columnCount; } 43 unsigned columnCount() const { return m_columnCount; }
44 44
45 RenderMultiColumnFlowThread* flowThread() const { return m_flowThread; } 45 RenderMultiColumnFlowThread* flowThread() const { return m_flowThread; }
46 46
47 bool requiresBalancing() const { return !m_columnHeightAvailable || style()- >columnFill() == ColumnFillBalance; } 47 bool requiresBalancing() const { return !m_columnHeightAvailable || style()- >columnFill() == ColumnFillBalance; }
48 48
49 bool shouldRelayoutMultiColumnBlock() const;
50
49 private: 51 private:
50 virtual bool isRenderMultiColumnBlock() const OVERRIDE { return true; } 52 virtual bool isRenderMultiColumnBlock() const OVERRIDE { return true; }
51 53
52 virtual const char* renderName() const OVERRIDE; 54 virtual const char* renderName() const OVERRIDE;
53 55
54 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) OVERRIDE; 56 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) OVERRIDE;
55 57
56 virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE; 58 virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE;
57 59
58 virtual bool updateLogicalWidthAndColumnWidth() OVERRIDE; 60 virtual bool updateLogicalWidthAndColumnWidth() OVERRIDE;
59 virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHe ight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) OVERR IDE; 61 virtual void checkForPaginationLogicalHeightChange(LayoutUnit&, bool&, bool& ) OVERRIDE;
60 virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, Layou tUnit pageLogicalHeight, LayoutStateMaintainer&) OVERRIDE;
61 62
62 virtual bool supportsPartialLayout() const OVERRIDE { return false; } 63 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
63 64
64 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE; 65 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
65 66
66 void computeColumnCountAndWidth(); 67 void computeColumnCountAndWidth();
67 68
68 void ensureColumnSets(); 69 void ensureColumnSets();
69 70
70 RenderMultiColumnFlowThread* m_flowThread; 71 RenderMultiColumnFlowThread* m_flowThread;
71 unsigned m_columnCount; // The default column count/width that are based o ff our containing block width. These values represent only the default, 72 unsigned m_columnCount; // The default column count/width that are based o ff our containing block width. These values represent only the default,
72 LayoutUnit m_columnWidth; // since a multi-column block that is split across variable width pages or regions will have different column counts and widths in each. 73 LayoutUnit m_columnWidth; // since a multi-column block that is split across variable width pages or regions will have different column counts and widths in each.
73 // These values will be cached (eventually) for mu lti-column blocks. 74 // These values will be cached (eventually) for mu lti-column blocks.
74 LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto. 75 LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.
75 bool m_inBalancingPass; // Set when relayouting for column balancing. 76 mutable bool m_inBalancingPass; // Set when relayouting for column balancing .
76 }; 77 };
77 78
78 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnBlock, isRenderMultiColumnBlock ()); 79 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnBlock, isRenderMultiColumnBlock ());
79 80
80 } // namespace WebCore 81 } // namespace WebCore
81 82
82 #endif // RenderMultiColumnBlock_h 83 #endif // RenderMultiColumnBlock_h
83 84
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderMultiColumnBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698