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

Side by Side Diff: Source/core/rendering/LayoutState.cpp

Issue 769093002: Remove FlowThreadController and relateds. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase master Created 6 years 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/rendering/LayoutState.h" 27 #include "core/rendering/LayoutState.h"
28 28
29 #include "core/rendering/RenderFlowThread.h"
29 #include "core/rendering/RenderInline.h" 30 #include "core/rendering/RenderInline.h"
30 #include "core/rendering/RenderLayer.h" 31 #include "core/rendering/RenderLayer.h"
31 #include "core/rendering/RenderView.h" 32 #include "core/rendering/RenderView.h"
32 #include "platform/Partitions.h" 33 #include "platform/Partitions.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 LayoutState::LayoutState(LayoutUnit pageLogicalHeight, bool pageLogicalHeightCha nged, RenderView& view) 37 LayoutState::LayoutState(LayoutUnit pageLogicalHeight, bool pageLogicalHeightCha nged, RenderView& view)
37 : m_isPaginated(pageLogicalHeight) 38 : m_isPaginated(pageLogicalHeight)
38 , m_pageLogicalHeightChanged(pageLogicalHeightChanged) 39 , m_pageLogicalHeightChanged(pageLogicalHeightChanged)
39 , m_containingBlockLogicalWidthChanged(false) 40 , m_containingBlockLogicalWidthChanged(false)
41 , m_flowThread(0)
40 , m_columnInfo(0) 42 , m_columnInfo(0)
41 , m_next(0) 43 , m_next(0)
42 , m_pageLogicalHeight(pageLogicalHeight) 44 , m_pageLogicalHeight(pageLogicalHeight)
43 , m_renderer(view) 45 , m_renderer(view)
44 { 46 {
45 ASSERT(!view.layoutState()); 47 ASSERT(!view.layoutState());
46 view.pushLayoutState(*this); 48 view.pushLayoutState(*this);
47 } 49 }
48 50
49 LayoutState::LayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn it pageLogicalHeight, bool pageLogicalHeightChanged, ColumnInfo* columnInfo, boo l containingBlockLogicalWidthChanged) 51 LayoutState::LayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUn it pageLogicalHeight, bool pageLogicalHeightChanged, ColumnInfo* columnInfo, boo l containingBlockLogicalWidthChanged)
50 : m_containingBlockLogicalWidthChanged(containingBlockLogicalWidthChanged) 52 : m_containingBlockLogicalWidthChanged(containingBlockLogicalWidthChanged)
51 , m_columnInfo(columnInfo) 53 , m_columnInfo(columnInfo)
52 , m_next(renderer.view()->layoutState()) 54 , m_next(renderer.view()->layoutState())
53 , m_renderer(renderer) 55 , m_renderer(renderer)
54 { 56 {
57 m_flowThread = renderer.isRenderFlowThread() ? toRenderFlowThread(&renderer) : m_next->flowThread();
55 renderer.view()->pushLayoutState(*this); 58 renderer.view()->pushLayoutState(*this);
56 bool fixed = renderer.isOutOfFlowPositioned() && renderer.style()->position( ) == FixedPosition; 59 bool fixed = renderer.isOutOfFlowPositioned() && renderer.style()->position( ) == FixedPosition;
57 if (fixed) { 60 if (fixed) {
58 // FIXME: This doesn't work correctly with transforms. 61 // FIXME: This doesn't work correctly with transforms.
59 FloatPoint fixedOffset = renderer.view()->localToAbsolute(FloatPoint(), IsFixed); 62 FloatPoint fixedOffset = renderer.view()->localToAbsolute(FloatPoint(), IsFixed);
60 m_layoutOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset; 63 m_layoutOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset;
61 } else { 64 } else {
62 m_layoutOffset = m_next->m_layoutOffset + offset; 65 m_layoutOffset = m_next->m_layoutOffset + offset;
63 } 66 }
64 67
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (!m_columnInfo) 99 if (!m_columnInfo)
97 m_columnInfo = m_next->m_columnInfo; 100 m_columnInfo = m_next->m_columnInfo;
98 101
99 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present. 102 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present.
100 } 103 }
101 104
102 LayoutState::LayoutState(RenderObject& root) 105 LayoutState::LayoutState(RenderObject& root)
103 : m_isPaginated(false) 106 : m_isPaginated(false)
104 , m_pageLogicalHeightChanged(false) 107 , m_pageLogicalHeightChanged(false)
105 , m_containingBlockLogicalWidthChanged(false) 108 , m_containingBlockLogicalWidthChanged(false)
109 , m_flowThread(0)
106 , m_columnInfo(0) 110 , m_columnInfo(0)
107 , m_next(root.view()->layoutState()) 111 , m_next(root.view()->layoutState())
108 , m_pageLogicalHeight(0) 112 , m_pageLogicalHeight(0)
109 , m_renderer(root) 113 , m_renderer(root)
110 { 114 {
111 // FIXME: Why does RenderTableSection create this wonky LayoutState? 115 // FIXME: Why does RenderTableSection create this wonky LayoutState?
112 ASSERT(!m_next || root.isTableSection()); 116 ASSERT(!m_next || root.isTableSection());
113 // We'll end up pushing in RenderView itself, so don't bother adding it. 117 // We'll end up pushing in RenderView itself, so don't bother adding it.
114 if (root.isRenderView()) 118 if (root.isRenderView())
115 return; 119 return;
(...skipping 28 matching lines...) Expand all
144 } 148 }
145 149
146 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit& childLogicalOffset) 150 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit& childLogicalOffset)
147 { 151 {
148 if (!m_columnInfo || m_columnInfo->columnHeight()) 152 if (!m_columnInfo || m_columnInfo->columnHeight())
149 return; 153 return;
150 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); 154 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset));
151 } 155 }
152 156
153 } // namespace blink 157 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698