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

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

Issue 2421793002: Move layout tree reconstruction code for Text nodes into new function (Closed)
Patch Set: Edits post Elliott's lgtm Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/core/dom/Text.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 clearNeedsStyleRecalc();
399 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) { 399 } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) {
400 reattachLayoutTree(); 400 rebuildTextLayoutTree(nextTextSibling);
401 if (this->layoutObject())
402 reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
403 clearNeedsReattachLayoutTree();
404 } 401 }
405 } 402 }
406 403
404 void Text::rebuildTextLayoutTree(Text* nextTextSibling) {
405 reattachLayoutTree();
406 if (layoutObject())
407 reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
408 clearNeedsReattachLayoutTree();
409 }
410
407 // If a whitespace node had no layoutObject and goes through a recalcStyle it 411 // 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. 412 // may need to create one if the parent style now has white-space: pre.
409 bool Text::needsWhitespaceLayoutObject() { 413 bool Text::needsWhitespaceLayoutObject() {
410 DCHECK(!layoutObject()); 414 DCHECK(!layoutObject());
411 if (const ComputedStyle* style = parentComputedStyle()) 415 if (const ComputedStyle* style = parentComputedStyle())
412 return style->preserveNewline(); 416 return style->preserveNewline();
413 return false; 417 return false;
414 } 418 }
415 419
416 // Passing both |textNode| and its layout object because repeated calls to 420 // Passing both |textNode| and its layout object because repeated calls to
(...skipping 29 matching lines...) Expand all
446 450
447 Text* Text::cloneWithData(const String& data) { 451 Text* Text::cloneWithData(const String& data) {
448 return create(document(), data); 452 return create(document(), data);
449 } 453 }
450 454
451 DEFINE_TRACE(Text) { 455 DEFINE_TRACE(Text) {
452 CharacterData::trace(visitor); 456 CharacterData::trace(visitor);
453 } 457 }
454 458
455 } // namespace blink 459 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Text.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698