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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
388 .createLayoutObject(); | 388 .createLayoutObject(); |
389 CharacterData::attachLayoutTree(reattachContext); | 389 CharacterData::attachLayoutTree(reattachContext); |
390 } | 390 } |
391 | 391 |
392 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) { | 392 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) { |
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 // In case we don't perform rebuildTextLayoutTree we will never clear the |
399 // NeedsReattachLayoutTree flag which is set on the creation of each | |
400 // Node. Clear that here. | |
401 clearNeedsReattachLayoutTree(); | |
399 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { | 402 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { |
400 rebuildTextLayoutTree(nextTextSibling); | 403 StyleReattachData styleReattachData; |
404 styleReattachData.computedStyle = nullptr; | |
esprehn
2016/12/14 04:30:48
remove this line
nainar
2016/12/14 22:21:54
Done.
| |
405 styleReattachData.nextTextSibling = nextTextSibling; | |
406 document().addStyleReattachData(*this, styleReattachData); | |
407 setNeedsReattachLayoutTree(); | |
401 } | 408 } |
409 clearNeedsStyleRecalc(); | |
402 } | 410 } |
403 | 411 |
404 void Text::rebuildTextLayoutTree(Text* nextTextSibling) { | 412 void Text::rebuildTextLayoutTree() { |
413 DCHECK(!needsStyleRecalc()); | |
414 DCHECK(!childNeedsStyleRecalc()); | |
415 DCHECK(needsReattachLayoutTree()); | |
416 DCHECK(parentNode()); | |
417 | |
405 reattachLayoutTree(); | 418 reattachLayoutTree(); |
406 if (layoutObject()) | 419 if (layoutObject()) { |
407 reattachWhitespaceSiblingsIfNeeded(nextTextSibling); | 420 reattachWhitespaceSiblingsIfNeeded( |
421 document().getStyleReattachData(*this).nextTextSibling); | |
422 } | |
408 clearNeedsReattachLayoutTree(); | 423 clearNeedsReattachLayoutTree(); |
409 } | 424 } |
410 | 425 |
411 // If a whitespace node had no layoutObject and goes through a recalcStyle it | 426 // If a whitespace node had no layoutObject and goes through a recalcStyle it |
412 // may need to create one if the parent style now has white-space: pre. | 427 // may need to create one if the parent style now has white-space: pre. |
413 bool Text::needsWhitespaceLayoutObject() { | 428 bool Text::needsWhitespaceLayoutObject() { |
414 DCHECK(!layoutObject()); | 429 DCHECK(!layoutObject()); |
415 if (const ComputedStyle* style = parentComputedStyle()) | 430 if (const ComputedStyle* style = parentComputedStyle()) |
416 return style->preserveNewline(); | 431 return style->preserveNewline(); |
417 return false; | 432 return false; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
450 | 465 |
451 Text* Text::cloneWithData(const String& data) { | 466 Text* Text::cloneWithData(const String& data) { |
452 return create(document(), data); | 467 return create(document(), data); |
453 } | 468 } |
454 | 469 |
455 DEFINE_TRACE(Text) { | 470 DEFINE_TRACE(Text) { |
456 CharacterData::trace(visitor); | 471 CharacterData::trace(visitor); |
457 } | 472 } |
458 | 473 |
459 } // namespace blink | 474 } // namespace blink |
OLD | NEW |