OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 * | 7 * |
8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
10 * disclaimer. | 10 * disclaimer. |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 // objects. Not that anyone _should_ try to access the interval tree when the | 83 // objects. Not that anyone _should_ try to access the interval tree when the |
84 // column sets are marked as invalid, but this is actually possible if other | 84 // column sets are marked as invalid, but this is actually possible if other |
85 // parts of the engine has bugs that cause us to not lay out everything that | 85 // parts of the engine has bugs that cause us to not lay out everything that |
86 // was marked for layout, so that LayoutObject::assertLaidOut() (and a LOT | 86 // was marked for layout, so that LayoutObject::assertLaidOut() (and a LOT |
87 // of other assertions) fails. | 87 // of other assertions) fails. |
88 m_multiColumnSetIntervalTree.clear(); | 88 m_multiColumnSetIntervalTree.clear(); |
89 } | 89 } |
90 | 90 |
91 void LayoutFlowThread::validateColumnSets() { | 91 void LayoutFlowThread::validateColumnSets() { |
92 m_columnSetsInvalidated = false; | 92 m_columnSetsInvalidated = false; |
93 // Called to get the maximum logical width for the columnSet. | |
94 updateLogicalWidth(); | |
95 generateColumnSetIntervalTree(); | 93 generateColumnSetIntervalTree(); |
96 } | 94 } |
97 | 95 |
98 bool LayoutFlowThread::mapToVisualRectInAncestorSpaceInternal( | 96 bool LayoutFlowThread::mapToVisualRectInAncestorSpaceInternal( |
99 const LayoutBoxModelObject* ancestor, | 97 const LayoutBoxModelObject* ancestor, |
100 TransformState& transformState, | 98 TransformState& transformState, |
101 VisualRectFlags visualRectFlags) const { | 99 VisualRectFlags visualRectFlags) const { |
102 // A flow thread should never be an invalidation container. | 100 // A flow thread should never be an invalidation container. |
103 DCHECK(ancestor != this); | 101 DCHECK(ancestor != this); |
104 transformState.flatten(); | 102 transformState.flatten(); |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 | 242 |
245 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded( | 243 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded( |
246 const MultiColumnSetInterval& interval) { | 244 const MultiColumnSetInterval& interval) { |
247 if (m_result) | 245 if (m_result) |
248 return; | 246 return; |
249 if (interval.low() <= m_offset && interval.high() > m_offset) | 247 if (interval.low() <= m_offset && interval.high() > m_offset) |
250 m_result = interval.data(); | 248 m_result = interval.data(); |
251 } | 249 } |
252 | 250 |
253 } // namespace blink | 251 } // namespace blink |
OLD | NEW |