Merge 53506 - 20100119 Carol Szabo <carol.szabo@nokia.com>...

WebCore/rendering/RenderObject.cpp

Index: WebCore/rendering/RenderObject.cpp
===================================================================
--- WebCore/rendering/RenderObject.cpp	(revision 38930)
+++ WebCore/rendering/RenderObject.cpp	(working copy)
@@ -1601,7 +1601,7 @@
     }
 }
 
-void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle*)
+void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     if (s_affectsParentBlock)
         handleDynamicFloatPositionChange();
@@ -1609,7 +1609,8 @@
     if (!m_parent)
         return;
     
-    if (diff == StyleDifferenceLayout)
+    if (diff == StyleDifferenceLayout) {
+        RenderCounter::rendererStyleChanged(this, oldStyle, m_style.get());
 
         // If the object already needs layout, then setNeedsLayout won't do
         // any work. But if the containing block has changed, then we may need
@@ -1620,7 +1621,7 @@
             markContainingBlocksForLayout();
 
         setNeedsLayoutAndPrefWidthsRecalc();
-    else if (diff == StyleDifferenceLayoutPositionedMovementOnly)
+    } else if (diff == StyleDifferenceLayoutPositionedMovementOnly)
         setNeedsPositionedMovementLayout();
 
     // Don't check for repaint here; we need to wait until the layer has been