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

Side by Side Diff: Source/core/dom/NodeRenderingContext.cpp

Issue 21182003: Remove NonSelectableText subclass of Text (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use createTextRenderer and RenderTextFragment Created 7 years, 4 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
« no previous file with comments | « no previous file | Source/core/dom/Text.h » ('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 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
7 * Copyright (C) 2011 Google Inc. All rights reserved. 7 * Copyright (C) 2011 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 RenderObject* parentRenderer = this->parentRenderer(); 265 RenderObject* parentRenderer = this->parentRenderer();
266 266
267 if (m_parentDetails.resetStyleInheritance()) 267 if (m_parentDetails.resetStyleInheritance())
268 m_style = textNode->document()->styleResolver()->defaultStyleForElement( ); 268 m_style = textNode->document()->styleResolver()->defaultStyleForElement( );
269 else 269 else
270 m_style = parentRenderer->style(); 270 m_style = parentRenderer->style();
271 271
272 if (!textNode->textRendererIsNeeded(*this)) 272 if (!textNode->textRendererIsNeeded(*this))
273 return; 273 return;
274 274
275 RenderText* newRenderer = textNode->createTextRenderer(m_style.get()); 275 RenderText* newRenderer = textNode->createTextRenderer(m_renderingParent, m_ style.get());
276 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { 276 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) {
277 newRenderer->destroy(); 277 newRenderer->destroy();
278 return; 278 return;
279 } 279 }
280 280
281 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style 281 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style
282 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail. 282 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail.
283 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 283 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
284 284
285 RenderObject* nextRenderer = this->nextRenderer(); 285 RenderObject* nextRenderer = this->nextRenderer();
286 textNode->setRenderer(newRenderer); 286 textNode->setRenderer(newRenderer);
287 // Parent takes care of the animations, no need to call setAnimatableStyle. 287 // Parent takes care of the animations, no need to call setAnimatableStyle.
288 newRenderer->setStyle(m_style.release()); 288 newRenderer->setStyle(m_style.release());
289 parentRenderer->addChild(newRenderer, nextRenderer); 289 parentRenderer->addChild(newRenderer, nextRenderer);
290 } 290 }
291 291
292 } 292 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Text.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698