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

Side by Side Diff: Source/core/rendering/RenderText.cpp

Issue 254573006: Avoid markDirty when removing out-of-flow line boxes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 return textBox; 1442 return textBox;
1443 } 1443 }
1444 1444
1445 void RenderText::positionLineBox(InlineBox* box) 1445 void RenderText::positionLineBox(InlineBox* box)
1446 { 1446 {
1447 InlineTextBox* s = toInlineTextBox(box); 1447 InlineTextBox* s = toInlineTextBox(box);
1448 1448
1449 // FIXME: should not be needed!!! 1449 // FIXME: should not be needed!!!
1450 if (!s->len()) { 1450 if (!s->len()) {
1451 // We want the box to be destroyed. 1451 // We want the box to be destroyed.
1452 s->remove(); 1452 s->remove(DontMarkLineBoxes);
1453 if (m_firstTextBox == s) 1453 if (m_firstTextBox == s)
1454 m_firstTextBox = s->nextTextBox(); 1454 m_firstTextBox = s->nextTextBox();
1455 else 1455 else
1456 s->prevTextBox()->setNextTextBox(s->nextTextBox()); 1456 s->prevTextBox()->setNextTextBox(s->nextTextBox());
1457 if (m_lastTextBox == s) 1457 if (m_lastTextBox == s)
1458 m_lastTextBox = s->prevTextBox(); 1458 m_lastTextBox = s->prevTextBox();
1459 else 1459 else
1460 s->nextTextBox()->setPreviousTextBox(s->prevTextBox()); 1460 s->nextTextBox()->setPreviousTextBox(s->prevTextBox());
1461 s->destroy(); 1461 s->destroy();
1462 return; 1462 return;
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1863 } 1863 }
1864 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1864 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1865 } 1865 }
1866 1866
1867 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() 1867 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
1868 { 1868 {
1869 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); 1869 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
1870 } 1870 }
1871 1871
1872 } // namespace WebCore 1872 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698