Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(820)

Side by Side Diff: third_party/WebKit/Source/core/dom/Text.cpp

Issue 2439973005: Revert of Move Layout Tree Construction code into Element::rebuildLayoutTree() (Closed)
Patch Set: Revert "Move Layout Tree Construction code into Element::rebuildLayoutTree()" Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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();
404 } 403 }
405 } 404 }
406 405
407 // If a whitespace node had no layoutObject and goes through a recalcStyle it 406 // 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. 407 // may need to create one if the parent style now has white-space: pre.
409 bool Text::needsWhitespaceLayoutObject() { 408 bool Text::needsWhitespaceLayoutObject() {
410 DCHECK(!layoutObject()); 409 DCHECK(!layoutObject());
411 if (const ComputedStyle* style = parentComputedStyle()) 410 if (const ComputedStyle* style = parentComputedStyle())
412 return style->preserveNewline(); 411 return style->preserveNewline();
413 return false; 412 return false;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 445
447 Text* Text::cloneWithData(const String& data) { 446 Text* Text::cloneWithData(const String& data) {
448 return create(document(), data); 447 return create(document(), data);
449 } 448 }
450 449
451 DEFINE_TRACE(Text) { 450 DEFINE_TRACE(Text) {
452 CharacterData::trace(visitor); 451 CharacterData::trace(visitor);
453 } 452 }
454 453
455 } // namespace blink 454 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.cpp ('k') | third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698