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

Unified Diff: Source/core/rendering/RenderInline.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated patch after splitting 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
Index: Source/core/rendering/RenderInline.cpp
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
index 4cfbffd965010dd8b14c3651a55b8f98fe8f7714..8e5b66fc954304ae54f39de7c3721e2bdb0ed834 100644
--- a/Source/core/rendering/RenderInline.cpp
+++ b/Source/core/rendering/RenderInline.cpp
@@ -196,7 +196,7 @@ void RenderInline::styleDidChange(StyleDifference diff, const LayoutStyle* oldSt
for (RenderInline* currCont = continuation; currCont; currCont = currCont->inlineElementContinuation()) {
RenderBoxModelObject* nextCont = currCont->continuation();
currCont->setContinuation(0);
- currCont->setStyle(style());
+ currCont->setStyle(mutableStyle());
currCont->setContinuation(nextCont);
}
@@ -359,7 +359,7 @@ void RenderInline::addChildIgnoringContinuation(LayoutObject* newChild, LayoutOb
RenderInline* RenderInline::clone() const
{
RenderInline* cloneInline = new RenderInline(node());
- cloneInline->setStyle(style());
+ cloneInline->setStyle(mutableStyle());
cloneInline->setFlowThreadState(flowThreadState());
return cloneInline;
}

Powered by Google App Engine
This is Rietveld 408576698