| 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) { | 393 if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) { |
| 394 if (change != NoChange || needsStyleRecalc()) | 394 if (change != NoChange || needsStyleRecalc()) |
| 395 layoutItem.setStyle(document().ensureStyleResolver().styleForText(this)); | 395 layoutItem.setStyle(document().ensureStyleResolver().styleForText(this)); |
| 396 if (needsStyleRecalc()) | 396 if (needsStyleRecalc()) |
| 397 layoutItem.setText(dataImpl()); | 397 layoutItem.setText(dataImpl()); |
| 398 clearNeedsStyleRecalc(); | 398 clearNeedsStyleRecalc(); |
| 399 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { | 399 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { |
| 400 reattachLayoutTree(); | 400 reattachLayoutTree(); |
| 401 if (this->layoutObject()) | 401 if (this->layoutObject()) |
| 402 reattachWhitespaceSiblingsIfNeeded(nextTextSibling); | 402 reattachWhitespaceSiblingsIfNeeded(nextTextSibling); |
| 403 clearNeedsReattachLayoutTree(); |
| 403 } | 404 } |
| 404 } | 405 } |
| 405 | 406 |
| 406 // If a whitespace node had no layoutObject and goes through a recalcStyle it | 407 // If a whitespace node had no layoutObject and goes through a recalcStyle it |
| 407 // may need to create one if the parent style now has white-space: pre. | 408 // may need to create one if the parent style now has white-space: pre. |
| 408 bool Text::needsWhitespaceLayoutObject() { | 409 bool Text::needsWhitespaceLayoutObject() { |
| 409 DCHECK(!layoutObject()); | 410 DCHECK(!layoutObject()); |
| 410 if (const ComputedStyle* style = parentComputedStyle()) | 411 if (const ComputedStyle* style = parentComputedStyle()) |
| 411 return style->preserveNewline(); | 412 return style->preserveNewline(); |
| 412 return false; | 413 return false; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 | 446 |
| 446 Text* Text::cloneWithData(const String& data) { | 447 Text* Text::cloneWithData(const String& data) { |
| 447 return create(document(), data); | 448 return create(document(), data); |
| 448 } | 449 } |
| 449 | 450 |
| 450 DEFINE_TRACE(Text) { | 451 DEFINE_TRACE(Text) { |
| 451 CharacterData::trace(visitor); | 452 CharacterData::trace(visitor); |
| 452 } | 453 } |
| 453 | 454 |
| 454 } // namespace blink | 455 } // namespace blink |
| OLD | NEW |