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

Unified Diff: trunk/Source/core/dom/RenderTreeBuilder.cpp

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/core/dom/PseudoElement.cpp ('k') | trunk/Source/core/dom/Text.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/dom/RenderTreeBuilder.cpp
===================================================================
--- trunk/Source/core/dom/RenderTreeBuilder.cpp (revision 190671)
+++ trunk/Source/core/dom/RenderTreeBuilder.cpp (working copy)
@@ -149,12 +149,12 @@
void RenderTreeBuilderForText::createRenderer()
{
LayoutObject* parentRenderer = this->parentRenderer();
- LayoutStyle& style = parentRenderer->mutableStyleRef();
+ LayoutStyle* style = parentRenderer->style();
- ASSERT(m_node->textRendererIsNeeded(style, *parentRenderer));
+ ASSERT(m_node->textRendererIsNeeded(*style, *parentRenderer));
RenderText* newRenderer = m_node->createTextRenderer(style);
- if (!parentRenderer->isChildAllowed(newRenderer, style)) {
+ if (!parentRenderer->isChildAllowed(newRenderer, *style)) {
newRenderer->destroy();
return;
}
@@ -166,7 +166,7 @@
LayoutObject* nextRenderer = this->nextRenderer();
m_node->setRenderer(newRenderer);
// Parent takes care of the animations, no need to call setAnimatableStyle.
- newRenderer->setStyle(&style);
+ newRenderer->setStyle(style);
parentRenderer->addChild(newRenderer, nextRenderer);
}
« no previous file with comments | « trunk/Source/core/dom/PseudoElement.cpp ('k') | trunk/Source/core/dom/Text.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698