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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
180 { | 180 { |
181 ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled() || !m_columnSetsInv alidated); | 181 ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled() || !m_columnSetsInv alidated); |
182 | 182 |
183 LayoutRect result; | 183 LayoutRect result; |
184 for (auto* columnSet : m_multiColumnSetList) | 184 for (auto* columnSet : m_multiColumnSetList) |
185 result.unite(columnSet->fragmentsBoundingBox(layerBoundingBox)); | 185 result.unite(columnSet->fragmentsBoundingBox(layerBoundingBox)); |
186 | 186 |
187 return result; | 187 return result; |
188 } | 188 } |
189 | 189 |
190 void LayoutFlowThread::flowThreadToVisualLogicalPosition(LayoutUnit& blockPositi on, LayoutUnit& inlinePosition) | |
191 { | |
192 LayoutPoint position(inlinePosition, blockPosition); | |
193 if (!isHorizontalWritingMode()) | |
194 position = position.transposedPoint(); | |
195 position = flipForWritingMode(position); | |
eae
2016/08/16 18:23:45
Instead of:
position = flipForWritingMode(positio
mstensho (USE GERRIT)
2016/08/16 18:55:27
columnOffset() works on physical coordinates, whil
| |
196 position.move(columnOffset(position)); | |
197 position = flipForWritingMode(position); | |
198 if (!isHorizontalWritingMode()) | |
199 position = position.transposedPoint(); | |
200 blockPosition = position.y(); | |
201 inlinePosition = position.x(); | |
202 } | |
203 | |
190 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval) | 204 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval) |
191 { | 205 { |
192 if (m_result) | 206 if (m_result) |
193 return; | 207 return; |
194 if (interval.low() <= m_offset && interval.high() > m_offset) | 208 if (interval.low() <= m_offset && interval.high() > m_offset) |
195 m_result = interval.data(); | 209 m_result = interval.data(); |
196 } | 210 } |
197 | 211 |
198 } // namespace blink | 212 } // namespace blink |
OLD | NEW |