OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1302 // itself to be turned into an InlineBox. We can't remove it here withou
t potentially losing track of | 1302 // itself to be turned into an InlineBox. We can't remove it here withou
t potentially losing track of |
1303 // the logically last run. | 1303 // the logically last run. |
1304 if (isolatedResolver.runs().runCount()) | 1304 if (isolatedResolver.runs().runCount()) |
1305 bidiRuns.replaceRunWithRuns(isolatedRun, isolatedResolver.runs()); | 1305 bidiRuns.replaceRunWithRuns(isolatedRun, isolatedResolver.runs()); |
1306 | 1306 |
1307 // If we encountered any nested isolate runs, just move them | 1307 // If we encountered any nested isolate runs, just move them |
1308 // to the top resolver's list for later processing. | 1308 // to the top resolver's list for later processing. |
1309 if (!isolatedResolver.isolatedRuns().isEmpty()) { | 1309 if (!isolatedResolver.isolatedRuns().isEmpty()) { |
1310 topResolver.isolatedRuns().append(isolatedResolver.isolatedRuns()); | 1310 topResolver.isolatedRuns().append(isolatedResolver.isolatedRuns()); |
1311 isolatedResolver.isolatedRuns().clear(); | 1311 isolatedResolver.isolatedRuns().clear(); |
| 1312 currentRoot = isolatedInline; |
1312 } | 1313 } |
1313 } | 1314 } |
1314 } | 1315 } |
1315 | 1316 |
1316 static inline bool segmentIsEmpty(const InlineIterator& segmentStart, const Inli
neIterator& segmentEnd) | 1317 static inline bool segmentIsEmpty(const InlineIterator& segmentStart, const Inli
neIterator& segmentEnd) |
1317 { | 1318 { |
1318 return segmentStart == segmentEnd; | 1319 return segmentStart == segmentEnd; |
1319 } | 1320 } |
1320 | 1321 |
1321 static inline void constructBidiRunsForLine(const RenderBlock* block, InlineBidi
Resolver& topResolver, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& end
OfLine, VisualDirectionOverride override, bool previousLineBrokeCleanly) | 1322 static inline void constructBidiRunsForLine(const RenderBlock* block, InlineBidi
Resolver& topResolver, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& end
OfLine, VisualDirectionOverride override, bool previousLineBrokeCleanly) |
(...skipping 2158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3480 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); | 3481 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); |
3481 | 3482 |
3482 setLineGridBox(lineGridBox); | 3483 setLineGridBox(lineGridBox); |
3483 | 3484 |
3484 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying | 3485 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying |
3485 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping | 3486 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping |
3486 // to this grid. | 3487 // to this grid. |
3487 } | 3488 } |
3488 | 3489 |
3489 } | 3490 } |
OLD | NEW |