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

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

Issue 1120313003: [New Multicolumn] Simplified layout also needs to mark spanner placeholders for layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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/LayoutBlockFlow.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef LayoutMultiColumnSpannerPlaceholder_h 5 #ifndef LayoutMultiColumnSpannerPlaceholder_h
6 #define LayoutMultiColumnSpannerPlaceholder_h 6 #define LayoutMultiColumnSpannerPlaceholder_h
7 7
8 #include "core/layout/LayoutMultiColumnFlowThread.h" 8 #include "core/layout/LayoutMultiColumnFlowThread.h"
9 9
10 namespace blink { 10 namespace blink {
11 11
12 // Placeholder layoutObject for column-span:all elements. The column-span:all la youtObject itself is a 12 // Placeholder layoutObject for column-span:all elements. The column-span:all la youtObject itself is a
13 // descendant of the flow thread, but due to its out-of-flow nature, we need som ething on the 13 // descendant of the flow thread, but due to its out-of-flow nature, we need som ething on the
14 // outside to take care of its positioning and sizing. LayoutMultiColumnSpannerP laceholder objects 14 // outside to take care of its positioning and sizing. LayoutMultiColumnSpannerP laceholder objects
15 // are siblings of LayoutMultiColumnSet objects, i.e. direct children of the mul ticol container. 15 // are siblings of LayoutMultiColumnSet objects, i.e. direct children of the mul ticol container.
16 class LayoutMultiColumnSpannerPlaceholder final : public LayoutBox { 16 class LayoutMultiColumnSpannerPlaceholder final : public LayoutBox {
17 public: 17 public:
18 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutMultiColumnSpannerPlaceholder || LayoutBox::isOfType(type); } 18 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutMultiColumnSpannerPlaceholder || LayoutBox::isOfType(type); }
19 19
20 static LayoutMultiColumnSpannerPlaceholder* createAnonymous(const ComputedSt yle& parentStyle, LayoutBox&); 20 static LayoutMultiColumnSpannerPlaceholder* createAnonymous(const ComputedSt yle& parentStyle, LayoutBox&);
21 21
22 LayoutFlowThread* flowThread() const { return toLayoutBlockFlow(parent())->m ultiColumnFlowThread(); } 22 LayoutFlowThread* flowThread() const { return toLayoutBlockFlow(parent())->m ultiColumnFlowThread(); }
23 23
24 LayoutBox* layoutObjectInFlowThread() const { return m_layoutObjectInFlowThr ead; } 24 LayoutBox* layoutObjectInFlowThread() const { return m_layoutObjectInFlowThr ead; }
25 void markForLayoutIfObjectInFlowThreadNeedsLayout()
26 {
27 if (!m_layoutObjectInFlowThread->needsLayout())
28 return;
29 // The containing block of a spanner is the multicol container (our pare nt here), but the
30 // spanner is laid out via its spanner set (us), so we need to make sure that we enter it.
31 setChildNeedsLayout(MarkOnlyThis);
32 }
25 void updateMarginProperties(); 33 void updateMarginProperties();
26 34
27 virtual const char* name() const override { return "LayoutMultiColumnSpanner Placeholder"; } 35 virtual const char* name() const override { return "LayoutMultiColumnSpanner Placeholder"; }
28 36
29 protected: 37 protected:
30 virtual void willBeRemovedFromTree() override; 38 virtual void willBeRemovedFromTree() override;
31 virtual bool needsPreferredWidthsRecalculation() const override; 39 virtual bool needsPreferredWidthsRecalculation() const override;
32 virtual LayoutUnit minPreferredLogicalWidth() const override; 40 virtual LayoutUnit minPreferredLogicalWidth() const override;
33 virtual LayoutUnit maxPreferredLogicalWidth() const override; 41 virtual LayoutUnit maxPreferredLogicalWidth() const override;
34 virtual void layout() override; 42 virtual void layout() override;
35 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override; 43 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override;
36 virtual void invalidateTreeIfNeeded(PaintInvalidationState&) override; 44 virtual void invalidateTreeIfNeeded(PaintInvalidationState&) override;
37 virtual void paint(const PaintInfo&, const LayoutPoint& paintOffset) overrid e; 45 virtual void paint(const PaintInfo&, const LayoutPoint& paintOffset) overrid e;
38 virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInCo ntainer, const LayoutPoint& accumulatedOffset, HitTestAction) override; 46 virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInCo ntainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
39 47
40 private: 48 private:
41 LayoutMultiColumnSpannerPlaceholder(LayoutBox*); 49 LayoutMultiColumnSpannerPlaceholder(LayoutBox*);
42 50
43 LayoutBox* m_layoutObjectInFlowThread; // The actual column-span:all layoutO bject inside the flow thread. 51 LayoutBox* m_layoutObjectInFlowThread; // The actual column-span:all layoutO bject inside the flow thread.
44 }; 52 };
45 53
46 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSpannerPlaceholder, isLayoutMul tiColumnSpannerPlaceholder()); 54 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSpannerPlaceholder, isLayoutMul tiColumnSpannerPlaceholder());
47 55
48 } // namespace blink 56 } // namespace blink
49 57
50 #endif 58 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698