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

Unified Diff: Source/WebCore/rendering/RenderLayerModelObject.h

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/RenderLayerModelObject.h
diff --git a/Source/WebCore/rendering/RenderLayerModelObject.h b/Source/WebCore/rendering/RenderLayerModelObject.h
index 1cb0ab3d12dd91659cc557b7badf36b6cd6fd5c5..365b90efa8d248fdc86c7461d1b78a7911a3e3d4 100644
--- a/Source/WebCore/rendering/RenderLayerModelObject.h
+++ b/Source/WebCore/rendering/RenderLayerModelObject.h
@@ -40,9 +40,9 @@ public:
bool hasSelfPaintingLayer() const;
RenderLayer* layer() const { return m_layer; }
- virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE;
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
- virtual void updateFromStyle() { }
+ virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle, StyleChangeState&) OVERRIDE;
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle, const StyleChangeState&) OVERRIDE;
+ virtual void updateFromStyle(const StyleChangeState&) { }
virtual bool requiresLayer() const = 0;
@@ -64,12 +64,6 @@ private:
virtual bool isLayerModelObject() const OVERRIDE { return true; }
RenderLayer* m_layer;
-
- // Used to store state between styleWillChange and styleDidChange
eseidel 2013/04/05 01:50:36 I'm gonna cry. But I can't tell if they're tears
- static bool s_wasFloating;
- static bool s_hadLayer;
- static bool s_hadTransform;
- static bool s_layerWasSelfPainting;
};
inline RenderLayerModelObject* toRenderLayerModelObject(RenderObject* object)

Powered by Google App Engine
This is Rietveld 408576698