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

Unified Diff: Source/WebCore/rendering/RenderButton.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/RenderButton.cpp
diff --git a/Source/WebCore/rendering/RenderButton.cpp b/Source/WebCore/rendering/RenderButton.cpp
index fd6911f49723d1cb1b0cf570cd96b07dcf9716dd..522e355bf06c8f0e9133fda8e3dcfe3d3e6ae458 100644
--- a/Source/WebCore/rendering/RenderButton.cpp
+++ b/Source/WebCore/rendering/RenderButton.cpp
@@ -71,7 +71,7 @@ void RenderButton::removeChild(RenderObject* oldChild)
m_inner->removeChild(oldChild);
}
-void RenderButton::styleWillChange(StyleDifference diff, const RenderStyle* newStyle)
+void RenderButton::styleWillChange(StyleDifference diff, const RenderStyle* newStyle, StyleChangeState& state)
{
if (m_inner) {
// RenderBlock::setStyle is going to apply a new style to the inner block, which
@@ -83,12 +83,12 @@ void RenderButton::styleWillChange(StyleDifference diff, const RenderStyle* newS
m_inner->style()->setMarginTop(newStyle->initialMargin());
m_inner->style()->setMarginBottom(newStyle->initialMargin());
}
- RenderBlock::styleWillChange(diff, newStyle);
+ RenderBlock::styleWillChange(diff, newStyle, state);
}
-void RenderButton::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+void RenderButton::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle, const StyleChangeState& state)
{
- RenderBlock::styleDidChange(diff, oldStyle);
+ RenderBlock::styleDidChange(diff, oldStyle, state);
if (m_buttonText)
m_buttonText->setStyle(style());

Powered by Google App Engine
This is Rietveld 408576698