| 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, 2007, 2008, 2009 Apple Inc. All rights | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights |
| 5 * reserved. | 5 * reserved. |
| 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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 } | 386 } |
| 387 | 387 |
| 388 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) { | 388 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) { |
| 389 if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) { | 389 if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) { |
| 390 if (change != NoChange || needsStyleRecalc()) | 390 if (change != NoChange || needsStyleRecalc()) |
| 391 layoutItem.setStyle(document().ensureStyleResolver().styleForText(this)); | 391 layoutItem.setStyle(document().ensureStyleResolver().styleForText(this)); |
| 392 if (needsStyleRecalc()) | 392 if (needsStyleRecalc()) |
| 393 layoutItem.setText(dataImpl()); | 393 layoutItem.setText(dataImpl()); |
| 394 clearNeedsStyleRecalc(); | 394 clearNeedsStyleRecalc(); |
| 395 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { | 395 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { |
| 396 rebuildTextLayoutTree(nextTextSibling); | 396 StyleReattachData styleReattachData; |
| 397 styleReattachData.nextTextSibling = nextTextSibling; |
| 398 document().addStyleReattachData(*this, styleReattachData); |
| 399 setNeedsReattachLayoutTree(); |
| 397 } | 400 } |
| 398 } | 401 } |
| 399 | 402 |
| 400 void Text::rebuildTextLayoutTree(Text* nextTextSibling) { | 403 void Text::rebuildTextLayoutTree() { |
| 404 DCHECK(!childNeedsStyleRecalc()); |
| 405 DCHECK(needsReattachLayoutTree()); |
| 406 DCHECK(parentNode()); |
| 407 |
| 401 reattachLayoutTree(); | 408 reattachLayoutTree(); |
| 402 if (layoutObject()) | 409 if (layoutObject()) { |
| 403 reattachWhitespaceSiblingsIfNeeded(nextTextSibling); | 410 reattachWhitespaceSiblingsIfNeeded( |
| 411 document().getStyleReattachData(*this).nextTextSibling); |
| 412 } |
| 404 clearNeedsReattachLayoutTree(); | 413 clearNeedsReattachLayoutTree(); |
| 405 } | 414 } |
| 406 | 415 |
| 407 // If a whitespace node had no layoutObject and goes through a recalcStyle it | 416 // If a whitespace node had no layoutObject and goes through a recalcStyle it |
| 408 // may need to create one if the parent style now has white-space: pre. | 417 // may need to create one if the parent style now has white-space: pre. |
| 409 bool Text::needsWhitespaceLayoutObject() { | 418 bool Text::needsWhitespaceLayoutObject() { |
| 410 DCHECK(!layoutObject()); | 419 DCHECK(!layoutObject()); |
| 411 if (const ComputedStyle* style = parentComputedStyle()) | 420 if (const ComputedStyle* style = parentComputedStyle()) |
| 412 return style->preserveNewline(); | 421 return style->preserveNewline(); |
| 413 return false; | 422 return false; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 460 |
| 452 Text* Text::cloneWithData(const String& data) { | 461 Text* Text::cloneWithData(const String& data) { |
| 453 return create(document(), data); | 462 return create(document(), data); |
| 454 } | 463 } |
| 455 | 464 |
| 456 DEFINE_TRACE(Text) { | 465 DEFINE_TRACE(Text) { |
| 457 CharacterData::trace(visitor); | 466 CharacterData::trace(visitor); |
| 458 } | 467 } |
| 459 | 468 |
| 460 } // namespace blink | 469 } // namespace blink |
| OLD | NEW |