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

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

Issue 13679002: Add StyleChangeState to get rid of a bunch of static state in the render tree. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/rendering/RenderInline.cpp
diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp
index 6788007858ccc6f93b7566fef46e9b0f06900464..40813042c4a5dee5b3a37cbf7242cd98a8e16d33 100644
--- a/Source/WebCore/rendering/RenderInline.cpp
+++ b/Source/WebCore/rendering/RenderInline.cpp
@@ -126,9 +126,9 @@ RenderInline* RenderInline::inlineElementContinuation() const
return toRenderBlock(continuation)->inlineElementContinuation();
}
-void RenderInline::updateFromStyle()
+void RenderInline::updateFromStyle(const StyleChangeState& state)
{
- RenderBoxModelObject::updateFromStyle();
+ RenderBoxModelObject::updateFromStyle(state);
setInline(true); // Needed for run-ins, since run-in is considered a block display type.
@@ -163,9 +163,9 @@ static void updateStyleOfAnonymousBlockContinuations(RenderObject* block, const
}
}
-void RenderInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+void RenderInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle, const StyleChangeState& state)
{
- RenderBoxModelObject::styleDidChange(diff, oldStyle);
+ RenderBoxModelObject::styleDidChange(diff, oldStyle, state);
// Ensure that all of the split inlines pick up the new style. We
// only do this if we're an inline, since we don't want to propagate

Powered by Google App Engine
This is Rietveld 408576698