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

Side by Side Diff: sky/engine/core/dom/Text.cpp

Issue 838003008: Get rid of ensureStyleResolver(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/dom/StyleEngine.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | 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 reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 void Text::attach(const AttachContext& context) 146 void Text::attach(const AttachContext& context)
147 { 147 {
148 RenderTreeBuilder(this, context.resolvedStyle).createRendererForTextIfNeeded (); 148 RenderTreeBuilder(this, context.resolvedStyle).createRendererForTextIfNeeded ();
149 CharacterData::attach(context); 149 CharacterData::attach(context);
150 } 150 }
151 151
152 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) 152 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
153 { 153 {
154 if (RenderText* renderer = this->renderer()) { 154 if (RenderText* renderer = this->renderer()) {
155 if (change != NoChange || needsStyleRecalc()) 155 if (change != NoChange || needsStyleRecalc())
156 renderer->setStyle(document().ensureStyleResolver().styleForText(thi s)); 156 renderer->setStyle(document().styleResolver().styleForText(this));
157 if (needsStyleRecalc()) 157 if (needsStyleRecalc())
158 renderer->setText(dataImpl()); 158 renderer->setText(dataImpl());
159 clearNeedsStyleRecalc(); 159 clearNeedsStyleRecalc();
160 } else if (needsStyleRecalc() || needsWhitespaceRenderer()) { 160 } else if (needsStyleRecalc() || needsWhitespaceRenderer()) {
161 reattach(); 161 reattach();
162 if (this->renderer()) 162 if (this->renderer())
163 reattachWhitespaceSiblings(nextTextSibling); 163 reattachWhitespaceSiblings(nextTextSibling);
164 } 164 }
165 } 165 }
166 166
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 result.appendLiteral("; "); 208 result.appendLiteral("; ");
209 result.appendLiteral("value="); 209 result.appendLiteral("value=");
210 result.append(s); 210 result.append(s);
211 } 211 }
212 212
213 strncpy(buffer, result.toString().utf8().data(), length - 1); 213 strncpy(buffer, result.toString().utf8().data(), length - 1);
214 } 214 }
215 #endif 215 #endif
216 216
217 } // namespace blink 217 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/dom/StyleEngine.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698