OLD | NEW |
1 /** | 1 /** |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 result = result->nextSibling(); | 264 result = result->nextSibling(); |
265 return result; | 265 return result; |
266 } | 266 } |
267 | 267 |
268 void LayoutListItem::updateMarkerLocationAndInvalidateWidth() | 268 void LayoutListItem::updateMarkerLocationAndInvalidateWidth() |
269 { | 269 { |
270 ASSERT(m_marker); | 270 ASSERT(m_marker); |
271 | 271 |
272 // FIXME: We should not modify the structure of the render tree | 272 // FIXME: We should not modify the structure of the render tree |
273 // during layout. crbug.com/370461 | 273 // during layout. crbug.com/370461 |
274 DeprecatedDisableModifyRenderTreeStructureAsserts disabler; | 274 DeprecatedDisableModifyLayoutTreeStructureAsserts disabler; |
275 LayoutState* layoutState = view()->layoutState(); | 275 LayoutState* layoutState = view()->layoutState(); |
276 LayoutFlowThread* currentFlowThread = nullptr; | 276 LayoutFlowThread* currentFlowThread = nullptr; |
277 if (layoutState) { | 277 if (layoutState) { |
278 // We're about to modify the layout tree structure (during layout!), and
any code using | 278 // We're about to modify the layout tree structure (during layout!), and
any code using |
279 // LayoutState might get utterly confused by that. There's no evidence t
hat anything other | 279 // LayoutState might get utterly confused by that. There's no evidence t
hat anything other |
280 // than the flow thread code will suffer, though, so just reset the curr
ent flow thread | 280 // than the flow thread code will suffer, though, so just reset the curr
ent flow thread |
281 // temporarily. | 281 // temporarily. |
282 // FIXME: get rid of this hack, including the flow thread setter in Layo
utState, as part of | 282 // FIXME: get rid of this hack, including the flow thread setter in Layo
utState, as part of |
283 // fixing crbug.com/370461 | 283 // fixing crbug.com/370461 |
284 currentFlowThread = layoutState->flowThread(); | 284 currentFlowThread = layoutState->flowThread(); |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 // assume that all the following ones have too. | 528 // assume that all the following ones have too. |
529 // This gives us the opportunity to stop here and avoid | 529 // This gives us the opportunity to stop here and avoid |
530 // marking the same nodes again. | 530 // marking the same nodes again. |
531 break; | 531 break; |
532 } | 532 } |
533 item->updateValue(); | 533 item->updateValue(); |
534 } | 534 } |
535 } | 535 } |
536 | 536 |
537 } // namespace blink | 537 } // namespace blink |
OLD | NEW |