OLD | NEW |
---|---|
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 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
112 } | 112 } |
113 | 113 |
114 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { | 114 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { |
115 m_layoutDelta = m_next->m_layoutDelta; | 115 m_layoutDelta = m_next->m_layoutDelta; |
116 #if !ASSERT_DISABLED | 116 #if !ASSERT_DISABLED |
117 m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated; | 117 m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated; |
118 m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated; | 118 m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated; |
119 #endif | 119 #endif |
120 } | 120 } |
121 | 121 |
122 m_isPaginated = m_pageLogicalHeight || m_columnInfo || renderer.isRenderFlow Thread(); | 122 m_isPaginated = m_pageLogicalHeight || m_columnInfo || renderer.flowThreadCo ntainingBlock(); |
abucur
2014/03/25 10:02:36
I think there's a chance you are breaking unsplitt
mstensho (USE GERRIT)
2014/03/26 09:56:25
Done.
| |
123 | 123 |
124 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present. | 124 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present. |
125 } | 125 } |
126 | 126 |
127 LayoutState::LayoutState(RenderObject& root) | 127 LayoutState::LayoutState(RenderObject& root) |
128 : m_clipped(false) | 128 : m_clipped(false) |
129 , m_isPaginated(false) | 129 , m_isPaginated(false) |
130 , m_pageLogicalHeightChanged(false) | 130 , m_pageLogicalHeightChanged(false) |
131 #if !ASSERT_DISABLED | 131 #if !ASSERT_DISABLED |
132 , m_layoutDeltaXSaturated(false) | 132 , m_layoutDeltaXSaturated(false) |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
177 } | 177 } |
178 | 178 |
179 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit& childLogicalOffset) | 179 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit& childLogicalOffset) |
180 { | 180 { |
181 if (!m_columnInfo || m_columnInfo->columnHeight()) | 181 if (!m_columnInfo || m_columnInfo->columnHeight()) |
182 return; | 182 return; |
183 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); | 183 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); |
184 } | 184 } |
185 | 185 |
186 } // namespace WebCore | 186 } // namespace WebCore |
OLD | NEW |