Merge 120639

Source/WebCore/rendering/RenderObject.h

Index: Source/WebCore/rendering/RenderObject.h
===================================================================
--- Source/WebCore/rendering/RenderObject.h	(revision 122239)
+++ Source/WebCore/rendering/RenderObject.h	(working copy)
@@ -567,16 +567,10 @@
 
     Node* node() const { return isAnonymous() ? 0 : m_node; }
 
-    // This is the same as node() except for renderers of :before. :after and first-letter
+    // Returns the styled node that caused the generation of this renderer.
+    // This is the same as node() except for renderers of :before and :after
     // pseudo elements for which their parent node is returned.
     Node* generatingNode() const { return m_node == document() ? 0 : m_node; }
-
-    // Returns the styled node that caused the generation of this renderer.
-    // This is the same as node() except for anonymous renderers, for which
-    // it returns the node whose style caused the generation of this renderer.
-    // FIXME: merge with generatingNode()
-    Node* styledGeneratingNode() const;
-
     void setNode(Node* node) { m_node = node; }
 
     Document* document() const { return m_node->document(); }
@@ -658,6 +652,8 @@
     virtual void dirtyLinesFromChangedChild(RenderObject*);
 
     // Called to update a style that is allowed to trigger animations.
+    // FIXME: Right now this will typically be called only when updating happens from the DOM on explicit elements.
+    // We don't yet handle generated content animation such as first-letter or before/after (we'll worry about this later).
     void setAnimatableStyle(PassRefPtr<RenderStyle>);
 
     // Set the style of the object and update the state of the object accordingly.