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

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

Issue 236203020: Separate repaint and layout requirements of StyleDifference (Step 1) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase, Fix break 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 | Annotate | Revision Log
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 { 186 {
187 return false; 187 return false;
188 } 188 }
189 189
190 void RenderText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl e) 190 void RenderText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl e)
191 { 191 {
192 // There is no need to ever schedule repaints from a style change of a text run, since 192 // There is no need to ever schedule repaints from a style change of a text run, since
193 // we already did this for the parent of the text run. 193 // we already did this for the parent of the text run.
194 // We do have to schedule layouts, though, since a style change can force us to 194 // We do have to schedule layouts, though, since a style change can force us to
195 // need to relayout. 195 // need to relayout.
196 if (diff == StyleDifferenceLayout) { 196 if (diff.needsFullLayout()) {
197 setNeedsLayoutAndPrefWidthsRecalc(); 197 setNeedsLayoutAndPrefWidthsRecalc();
198 m_knownToHaveNoOverflowAndNoFallbackFonts = false; 198 m_knownToHaveNoOverflowAndNoFallbackFonts = false;
199 } 199 }
200 200
201 RenderStyle* newStyle = style(); 201 RenderStyle* newStyle = style();
202 ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE; 202 ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE;
203 ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE; 203 ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE;
204 if (oldTransform != newStyle->textTransform() || oldSecurity != newStyle->te xtSecurity()) 204 if (oldTransform != newStyle->textTransform() || oldSecurity != newStyle->te xtSecurity())
205 transformText(); 205 transformText();
206 206
(...skipping 1656 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/RenderTableRow.cpp ('k') | Source/core/rendering/RenderTextControlSingleLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698