| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 // If the marker is currently contained inside an anonymous box, then we | 294 // If the marker is currently contained inside an anonymous box, then we |
| 295 // are the only item in that anonymous box (since no line box parent was | 295 // are the only item in that anonymous box (since no line box parent was |
| 296 // found). It's ok to just leave the marker where it is in this case. | 296 // found). It's ok to just leave the marker where it is in this case. |
| 297 if (markerParent && markerParent->isAnonymousBlock()) | 297 if (markerParent && markerParent->isAnonymousBlock()) |
| 298 lineBoxParent = markerParent; | 298 lineBoxParent = markerParent; |
| 299 else | 299 else |
| 300 lineBoxParent = this; | 300 lineBoxParent = this; |
| 301 } | 301 } |
| 302 | 302 |
| 303 if (markerParent != lineBoxParent) { | 303 if (markerParent != lineBoxParent) { |
| 304 updateFirstLetter(); | |
| 305 m_marker->remove(); | 304 m_marker->remove(); |
| 306 // FIXME(crbug.com/391009): Investigate whether this call is needed. | 305 // FIXME(crbug.com/391009): Investigate whether this call is needed. |
| 307 if (markerParent) | 306 if (markerParent) |
| 308 markerParent->dirtyLinesFromChangedChild(m_marker); | 307 markerParent->dirtyLinesFromChangedChild(m_marker); |
| 309 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent)); | 308 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent)); |
| 310 m_marker->updateMarginsAndContent(); | 309 m_marker->updateMarginsAndContent(); |
| 311 // If markerParent is an anonymous block with no children, destroy it. | 310 // If markerParent is an anonymous block with no children, destroy it. |
| 312 if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlock(m
arkerParent)->firstChild() && !toRenderBlock(markerParent)->continuation()) | 311 if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlock(m
arkerParent)->firstChild() && !toRenderBlock(markerParent)->continuation()) |
| 313 markerParent->destroy(); | 312 markerParent->destroy(); |
| 314 return true; | 313 return true; |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 // assume that all the following ones have too. | 522 // assume that all the following ones have too. |
| 524 // This gives us the opportunity to stop here and avoid | 523 // This gives us the opportunity to stop here and avoid |
| 525 // marking the same nodes again. | 524 // marking the same nodes again. |
| 526 break; | 525 break; |
| 527 } | 526 } |
| 528 item->updateValue(); | 527 item->updateValue(); |
| 529 } | 528 } |
| 530 } | 529 } |
| 531 | 530 |
| 532 } // namespace WebCore | 531 } // namespace WebCore |
| OLD | NEW |