| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } else { | 103 } else { |
| 104 m_isPaginated = m_pageLogicalHeight || m_next->m_columnInfo || rende
rer.flowThreadContainingBlock(); | 104 m_isPaginated = m_pageLogicalHeight || m_next->m_columnInfo || rende
rer.flowThreadContainingBlock(); |
| 105 } | 105 } |
| 106 } | 106 } |
| 107 | 107 |
| 108 if (!m_columnInfo) | 108 if (!m_columnInfo) |
| 109 m_columnInfo = m_next->m_columnInfo; | 109 m_columnInfo = m_next->m_columnInfo; |
| 110 | 110 |
| 111 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { | 111 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { |
| 112 m_layoutDelta = m_next->m_layoutDelta; | 112 m_layoutDelta = m_next->m_layoutDelta; |
| 113 #if !ASSERT_DISABLED | 113 #if ASSERT_ENABLED |
| 114 m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated; | 114 m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated; |
| 115 m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated; | 115 m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated; |
| 116 #endif | 116 #endif |
| 117 } | 117 } |
| 118 | 118 |
| 119 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip
if present. | 119 // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip
if present. |
| 120 } | 120 } |
| 121 | 121 |
| 122 LayoutState::LayoutState(RenderObject& root) | 122 LayoutState::LayoutState(RenderObject& root) |
| 123 : m_clipped(false) | 123 : m_clipped(false) |
| 124 , m_isPaginated(false) | 124 , m_isPaginated(false) |
| 125 , m_pageLogicalHeightChanged(false) | 125 , m_pageLogicalHeightChanged(false) |
| 126 #if !ASSERT_DISABLED | 126 #if ASSERT_ENABLED |
| 127 , m_layoutDeltaXSaturated(false) | 127 , m_layoutDeltaXSaturated(false) |
| 128 , m_layoutDeltaYSaturated(false) | 128 , m_layoutDeltaYSaturated(false) |
| 129 #endif | 129 #endif |
| 130 , m_columnInfo(0) | 130 , m_columnInfo(0) |
| 131 , m_next(0) | 131 , m_next(0) |
| 132 , m_pageLogicalHeight(0) | 132 , m_pageLogicalHeight(0) |
| 133 #ifndef NDEBUG | 133 #ifndef NDEBUG |
| 134 , m_renderer(&root) | 134 , m_renderer(&root) |
| 135 #endif | 135 #endif |
| 136 { | 136 { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 } | 171 } |
| 172 | 172 |
| 173 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit&
childLogicalOffset) | 173 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit&
childLogicalOffset) |
| 174 { | 174 { |
| 175 if (!m_columnInfo || m_columnInfo->columnHeight()) | 175 if (!m_columnInfo || m_columnInfo->columnHeight()) |
| 176 return; | 176 return; |
| 177 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); | 177 m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset)); |
| 178 } | 178 } |
| 179 | 179 |
| 180 } // namespace WebCore | 180 } // namespace WebCore |
| OLD | NEW |