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

Unified Diff: Source/WebCore/rendering/RenderScrollbarPart.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/RenderScrollbarPart.cpp
diff --git a/Source/WebCore/rendering/RenderScrollbarPart.cpp b/Source/WebCore/rendering/RenderScrollbarPart.cpp
index e17b853e717a03096eeaa04f1b96de2367fa4869..49e884ddc1e7b8569616e271d7338ba0d136bd59 100644
--- a/Source/WebCore/rendering/RenderScrollbarPart.cpp
+++ b/Source/WebCore/rendering/RenderScrollbarPart.cpp
@@ -140,15 +140,15 @@ void RenderScrollbarPart::computePreferredLogicalWidths()
setPreferredLogicalWidthsDirty(false);
}
-void RenderScrollbarPart::styleWillChange(StyleDifference diff, const RenderStyle* newStyle)
+void RenderScrollbarPart::styleWillChange(StyleDifference diff, const RenderStyle* newStyle, StyleChangeState& state)
{
- RenderBlock::styleWillChange(diff, newStyle);
+ RenderBlock::styleWillChange(diff, newStyle, state);
setInline(false);
}
-void RenderScrollbarPart::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+void RenderScrollbarPart::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle, const StyleChangeState& state)
{
- RenderBlock::styleDidChange(diff, oldStyle);
+ RenderBlock::styleDidChange(diff, oldStyle, state);
setInline(false);
clearPositionedState();
setFloating(false);

Powered by Google App Engine
This is Rietveld 408576698