Add StyleChangeState to get rid of a bunch of static state in the render tree.

Source/WebCore/rendering/RenderObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 130 matching lines @@
 #endif
 };
 #endif
 
 typedef WTF::HashSet<const RenderObject*> RenderObjectAncestorLineboxDirtySet;
 
 #ifndef NDEBUG
 const int showTreeCharacterOffset = 39;
 #endif
 
+struct StyleChangeState {
+    // RenderObject
+    unsigned affectsParentBlock : 1;
+
+    // RenderLayerModelObject
+    unsigned wasFloating : 1;
+    unsigned hadLayer : 1;
+    unsigned hadTransform : 1;
+    unsigned layerWasSelfPainting : 1;
+
+    // RenderBox
+    unsigned hadOverflowClip : 1;
+
+    // RenderBlock
+    unsigned couldPropagateFloatIntoSibling : 1;
+
+    StyleChangeState() :
+        affectsParentBlock(0),

[eseidel, 2013/04/05 01:50:36]

I take it the compiler doesn't like "false"?

[esprehn, 2013/04/17 03:29:01]

Nah, I was just moving fast. I'll change to false.

+        wasFloating(0),
+        hadLayer(0),
+        hadTransform(0),
+        layerWasSelfPainting(0),
+        hadOverflowClip(0),
+        couldPropagateFloatIntoSibling(0)
+    {
+    }
+};
+
 // Base class for all rendering tree objects.
 class RenderObject : public CachedImageClient {
     friend class RenderBlock;
     friend class RenderLayer;
     friend class RenderObjectChildList;
 public:
     // Anonymous objects should pass the document as their node, and they will then automatically be
     // marked as anonymous in the constructor.
     explicit RenderObject(Node*);
     virtual ~RenderObject();
@@ skipping 831 matching lines @@
 
     // Return the renderer whose background style is used to paint the root background. Should only be called on the renderer for which isRoot() is true.
     RenderObject* rendererForRootBackground();
 
     RespectImageOrientationEnum shouldRespectImageOrientation() const;
 
 protected:
     inline bool layerCreationAllowedForSubtree() const;
 
     // Overrides should call the superclass at the end
-    virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
+    virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle, StyleChangeState&);
     // Overrides should call the superclass at the start
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle, const StyleChangeState&);
     void propagateStyleToAnonymousChildren(bool blockChildrenOnly = false);
 
     void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, BoxSide,
                             Color, EBorderStyle, int adjbw1, int adjbw2, bool antialias = false);
 
     void paintFocusRing(PaintInfo&, const LayoutPoint&, RenderStyle*);
     void paintOutline(PaintInfo&, const LayoutRect&);
     void addPDFURLRect(GraphicsContext*, const LayoutRect&);
     
     virtual LayoutRect viewRect() const;
@@ skipping 147 matching lines @@
 #undef ADD_BOOLEAN_BITFIELD
 
     RenderObjectBitfields m_bitfields;
 
     void setNeedsPositionedMovementLayout(bool b) { m_bitfields.setNeedsPositionedMovementLayout(b); }
     void setNormalChildNeedsLayout(bool b) { m_bitfields.setNormalChildNeedsLayout(b); }
     void setPosChildNeedsLayout(bool b) { m_bitfields.setPosChildNeedsLayout(b); }
     void setNeedsSimplifiedNormalFlowLayout(bool b) { m_bitfields.setNeedsSimplifiedNormalFlowLayout(b); }
     void setIsDragging(bool b) { m_bitfields.setIsDragging(b); }
     void setEverHadLayout(bool b) { m_bitfields.setEverHadLayout(b); }
-
-private:
-    // Store state between styleWillChange and styleDidChange
-    static bool s_affectsParentBlock;
 };
 
 inline bool RenderObject::documentBeingDestroyed() const
 {
     return !document()->renderer();
 }
 
 inline bool RenderObject::isBeforeContent() const
 {
     if (style()->styleType() != BEFORE)
@@ skipping 186 matching lines @@
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::RenderObject*);
 void showLineTree(const WebCore::RenderObject*);
 void showRenderTree(const WebCore::RenderObject* object1);
 // We don't make object2 an optional parameter so that showRenderTree
 // can be called from gdb easily.
 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderObject* object2);
 #endif
 
 #endif // RenderObject_h