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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 if (renderer.isUnsplittableForPagination()) | 100 if (renderer.isUnsplittableForPagination()) |
101 m_pageLogicalHeight = 0; | 101 m_pageLogicalHeight = 0; |
102 } | 102 } |
103 | 103 |
104 if (!m_columnInfo) | 104 if (!m_columnInfo) |
105 m_columnInfo = m_next->m_columnInfo; | 105 m_columnInfo = m_next->m_columnInfo; |
106 | 106 |
107 if (renderer.isRenderBlock()) { | 107 if (renderer.isRenderBlock()) { |
108 const RenderBlock& renderBlock = toRenderBlock(renderer); | 108 const RenderBlock& renderBlock = toRenderBlock(renderer); |
109 m_shapeInsideInfo = renderBlock.shapeInsideInfo(); | 109 m_shapeInsideInfo = renderBlock.shapeInsideInfo(); |
110 if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock.allow
sShapeInsideInfoSharing(m_next->m_shapeInsideInfo->owner())) | 110 if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock.allow
sShapeInsideInfoSharing(&m_next->m_shapeInsideInfo->owner())) |
111 m_shapeInsideInfo = m_next->m_shapeInsideInfo; | 111 m_shapeInsideInfo = m_next->m_shapeInsideInfo; |
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 } |
(...skipping 56 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 |