Title: [122241] branches/chromium/1180
Revision
122241
Author
[email protected]
Date
2012-07-10 12:02:06 -0700 (Tue, 10 Jul 2012)

Log Message

Merge 120639
BUG=132396
Review URL: https://chromiumcodereview.appspot.com/10696154

Modified Paths

Removed Paths

Diff

Deleted: branches/chromium/1180/LayoutTests/animations/first-letter-animation-expected.txt (122240 => 122241)


--- branches/chromium/1180/LayoutTests/animations/first-letter-animation-expected.txt	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/animations/first-letter-animation-expected.txt	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,6 +0,0 @@
-Lorem ipsum dolor sit amet.
-Animations test result: 
-
-PASS
-PASS
-

Deleted: branches/chromium/1180/LayoutTests/animations/first-letter-animation.html (122240 => 122241)


--- branches/chromium/1180/LayoutTests/animations/first-letter-animation.html	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/animations/first-letter-animation.html	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<style type="text/css" media="screen">
-    .box {
-      position: relative;
-      width: 100px;
-      height: 100px;
-      background: blue;
-      -webkit-animation: boxAnimation 0.1s 0.1s linear;
-    }
-
-    .box::first-letter {
-      color: black;
-      -webkit-animation: firstLetterAnimation 0.1s 0.2s forwards ease-out;
-    }
-
-    @-webkit-keyframes firstLetterAnimation {
-      from { font-size: 24pt;}
-      to { font-size: 40pt;}
-    }
-
-    @-webkit-keyframes boxAnimation {
-      from { 
-             font-size: 40pt;
-             -webkit-transform: rotate(0deg);
-      }
-      to {
-           font-size: 2pt;
-           -webkit-transform: rotate(360deg);
-      }
-    }
-
-</style>
-<script type="text/_javascript_" charset="utf-8">
-   if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
-    }
-
-    var result = "Animations test result: <br><br>";
-    var animations = 0;
-    function animationEnded(event)
-    {
-        if ((event.animationName == "firstLetterAnimation" || event.animationName == "boxAnimation") &&
-            parseFloat(event.elapsedTime).toFixed(2) == 0.1)
-           result += "PASS<br>";
-        else
-           result += "FAIL<br>";
-
-        ++animations;
-        if (animations == 2) {
-            document.getElementById('result').innerHTML = result;
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
-        }
-    }
-
-    window.addEventListener("webkitAnimationEnd", animationEnded, false );
-</script>
-</head>
-<body>
-  <div class="box">
-    Lorem ipsum dolor sit amet.
-  </div>
-  <div id="result" style="position:absolute; top:150px">
-  </div>
-</body>
-</html>

Deleted: branches/chromium/1180/LayoutTests/animations/first-letter-play-state-expected.txt (122240 => 122241)


--- branches/chromium/1180/LayoutTests/animations/first-letter-play-state-expected.txt	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/animations/first-letter-play-state-expected.txt	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,6 +0,0 @@
-This tests the operation of -webkit-animation-play-state. After 100 milliseconds the box should stop and after 150 milliseconds it should start again. We test it both while in motion and when stopped.
-
-Lorem ipsum dolor sit amet.
-PASS - "left" property for "box1" element at 0.1s saw something close to: 200
-PASS - "left" property for "box1" element at 0.13s saw something close to: 200
-

Deleted: branches/chromium/1180/LayoutTests/animations/first-letter-play-state.html (122240 => 122241)


--- branches/chromium/1180/LayoutTests/animations/first-letter-play-state.html	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/animations/first-letter-play-state.html	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,92 +0,0 @@
-<html>
-<head>
-  <title>Test of -webkit-animation-play-state with first-letter pseudo element</title>
-  <style type="text/css" media="screen">
-    #box1 {
-      position: absolute;
-      height: 100px;
-      width: 100px;
-      background-color: blue;
-      color: red;
-      -webkit-animation: move1 0.2s linear;
-    }
-    #box1::first-letter {
-      color: white;
-      -webkit-animation: firstLetterAnimation 0.21s linear;
-    }
-    #box1.paused::first-letter {
-      -webkit-animation-play-state: paused;
-    }
-    #box1.running::first-letter {
-      -webkit-animation-play-state: running;
-    }
-    @-webkit-keyframes move1 {
-        from { left: 0px ; color: red;}
-        to   { left: 400px; color: black;}
-    }
-    @-webkit-keyframes firstLetterAnimation {
-        from { color: white; }
-        to { color: green; }
-    }
-  </style>
-  <script src="" type="text/_javascript_" charset="utf-8"></script>
-  <script type="text/_javascript_" charset="utf-8">
-    
-    const expectedValues = [
-      // [animation-name, time, element-id, property, expected-value, tolerance]
-      ["move1", 0.1, "box1", "left", 200, 20],
-      ["move1", 0.13, "box1", "left", 200, 20]
-    ];
-    
-    function stop()
-    {
-        box1Element = document.getElementById("box1");
-        box1Element.className = "paused";
-        box1Element.style.webkitAnimationPlayState = "paused";
-    }
-
-    function start()
-    {
-        box1Element = document.getElementById("box1");
-        box1Element.className = "running";
-        box1Element.style.webkitAnimationPlayState = "running";
-    }
-
-    function setTimers()
-    {
-        setTimeout(stop, 100);
-        setTimeout(start, 150);
-    }
-
-    var move1AnimationEnded = false;
-    function animationEnded(event)
-    {
-        if (event.animationName == "move1")
-            move1AnimationEnded = true;
-
-        if (event.animationName == "firstLetterAnimation" && move1AnimationEnded) {
-            document.getElementById('resultFirstLetter').innerHTML = "Test Failed: firstLetterAnimation should end before move1 animation<br>";
-        }
-    }
-
-    window.addEventListener("webkitAnimationEnd", animationEnded, false );
-    
-    runAnimationTest(expectedValues, setTimers, null, true);
-    
-  </script>
-</head>
-<body>
-<p>
-This tests the operation of -webkit-animation-play-state. After 100 milliseconds the box should stop and after 150 milliseconds
-it should start again. We test it both while in motion and when stopped.
-<div id="box1">
-    Lorem ipsum dolor sit amet.
-</div>
-<div id="box2">
-</div>
-<div id="result">
-</div>
-<div id="resultFirstLetter">
-</div>
-</body>
-</html>

Modified: branches/chromium/1180/LayoutTests/platform/chromium/TestExpectations (122240 => 122241)


--- branches/chromium/1180/LayoutTests/platform/chromium/TestExpectations	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/platform/chromium/TestExpectations	2012-07-10 19:02:06 UTC (rev 122241)
@@ -3713,9 +3713,6 @@
 
 BUGWK88939 DEBUG : fast/events/before-unload-adopt-subframe-to-outside.html = TEXT
 
-BUGWK88937 DEBUG LINUX MAC : animations/first-letter-play-state.html = TEXT
-BUGWK88937 WIN : animations/first-letter-play-state.html = TEXT
-
 BUGCR131187 : canvas/philip/tests/2d.gradient.radial.cone.cylinder.html = TEXT
 BUGCR131187 : fast/canvas/canvas-currentColor.html = TEXT
 

Modified: branches/chromium/1180/LayoutTests/platform/efl/TestExpectations (122240 => 122241)


--- branches/chromium/1180/LayoutTests/platform/efl/TestExpectations	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/platform/efl/TestExpectations	2012-07-10 19:02:06 UTC (rev 122241)
@@ -708,6 +708,3 @@
 // Flexbox test failing on EFL.
 BUGWK88984 : css3/flexbox/flexitem.html = TEXT
 
-// Animation timing inaccurate.
-BUGWK88986 : animations/first-letter-play-state.html = TEXT
-

Deleted: branches/chromium/1180/LayoutTests/transitions/first-letter-color-transition-expected.txt (122240 => 122241)


--- branches/chromium/1180/LayoutTests/transitions/first-letter-color-transition-expected.txt	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/transitions/first-letter-color-transition-expected.txt	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,2 +0,0 @@
-Lorem ipsum dolor sit amet.
-PASS

Deleted: branches/chromium/1180/LayoutTests/transitions/first-letter-color-transition.html (122240 => 122241)


--- branches/chromium/1180/LayoutTests/transitions/first-letter-color-transition.html	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/transitions/first-letter-color-transition.html	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<style type="text/css" media="screen">
-    .box {
-      width: 100px;
-      height: 100px;
-      background-color: blue;
-    }
-    
-    .box::first-letter {
-      font-size: 24pt;
-      color: black;
-      -webkit-transition: color 0.1s;
-    }
-
-    body.go .box::first-letter {
-      color: white;
-    }
-
-</style>
-<script  type="text/_javascript_" charset="utf-8">
-   if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    var result = "";
-    function transitionEnded(event)
-    {   
-        if (event.propertyName == "color")
-           result += "PASS";
-        else
-           result += "FAIL";
-
-        document.getElementById('result').innerHTML = result;
-        if (window.testRunner)
-            testRunner.notifyDone();
-    }
-
-    window.addEventListener('webkitTransitionEnd', transitionEnded, false);
-
-    window.addEventListener('load', function () {
-        document.body.className = "go";
-    }, false);
-</script>
-</head>
-<body>
-  <div class="box">
-    Lorem ipsum dolor sit amet.
-  </div>
-  <div id="result">
-  </div>
-</body>
-</html>

Deleted: branches/chromium/1180/LayoutTests/transitions/first-letter-transition-expected.txt (122240 => 122241)


--- branches/chromium/1180/LayoutTests/transitions/first-letter-transition-expected.txt	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/transitions/first-letter-transition-expected.txt	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,10 +0,0 @@
-Box One
-Box two
-Transtions test result: 
-
-PASS 
-PASS 
-PASS 
-PASS 
-PASS 
-

Deleted: branches/chromium/1180/LayoutTests/transitions/first-letter-transition.html (122240 => 122241)


--- branches/chromium/1180/LayoutTests/transitions/first-letter-transition.html	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/LayoutTests/transitions/first-letter-transition.html	2012-07-10 19:02:06 UTC (rev 122241)
@@ -1,85 +0,0 @@
-<html>
-<head>
-<style type="text/css" media="screen">
-    .box {
-      position: relative;
-      width: 100px;
-      height: 100px;
-      left: 100px;
-      background-color: blue;
-    }
-
-    .box::first-letter {
-      font-size: 24pt;
-      color: black;
-      -webkit-transition: color 0.1s 0.1s;
-    }
-
-    #first {
-      -webkit-transition: left 0.1s 0.15s;
-    }
-
-    #second {
-      -webkit-transition: all 0.1s 0.2s;
-    }
-
-    .animating #first {
-      left: 400px;
-    }
-
-    .animating #second {
-      -webkit-transform: rotate(360deg);
-      color: purple;
-    }
-
-    .animating *::first-letter {
-      color: white;
-    }
-
-
-</style>
-<script src=""
-<script  type="text/_javascript_" charset="utf-8">
-   if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    var result = "Transtions test result: <br><br>";
-    var transitions = 0;
-    function transitionEnded(event)
-    {
-        if ((event.propertyName == "color") || (event.propertyName == "left") || (event.propertyName == "-webkit-transform"))
-           result += "PASS <br>";
-        else
-           result += "FAIL <br>";
-
-        ++transitions;
-
-        if (transitions == 5) {
-            document.getElementById('result').innerHTML = result;
-            if (window.testRunner)
-                testRunner.notifyDone();
-        }
-    }
-
-    window.addEventListener( 'webkitTransitionEnd', transitionEnded, false );
-
-    window.addEventListener("load", function () {
-        document.getElementById('container').className = 'animating';
-    }, false);
-</script>
-</head>
-<body>
-<div id="container">
-  <div id="first" class="box">
-      Box One
-  </div>
-  <div id="second" class="box">
-      Box two
-  </div>
-</div>
-  <div id="result">
-  </div>
-</body>
-</html>

Modified: branches/chromium/1180/Source/WebCore/page/animation/AnimationBase.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/page/animation/AnimationBase.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/page/animation/AnimationBase.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -191,7 +191,7 @@
 
                 // Trigger a render so we can start the animation
                 if (m_object)
-                    m_compAnim->animationController()->addNodeChangeToDispatch(m_object->styledGeneratingNode());
+                    m_compAnim->animationController()->addNodeChangeToDispatch(m_object->node());
             } else {
                 ASSERT(!paused());
                 // We're waiting for the start timer to fire and we got a pause. Cancel the timer, pause and wait
@@ -252,7 +252,7 @@
 
                 // Dispatch updateStyleIfNeeded so we can start the animation
                 if (m_object)
-                    m_compAnim->animationController()->addNodeChangeToDispatch(m_object->styledGeneratingNode());
+                    m_compAnim->animationController()->addNodeChangeToDispatch(m_object->node());
             } else {
                 // We are pausing while waiting for a start response. Cancel the animation and wait. When 
                 // we unpause, we will act as though the start timer just fired
@@ -298,7 +298,7 @@
                         resumeOverriddenAnimations();
 
                     // Fire off another style change so we can set the final value
-                    m_compAnim->animationController()->addNodeChangeToDispatch(m_object->styledGeneratingNode());
+                    m_compAnim->animationController()->addNodeChangeToDispatch(m_object->node());
                 }
             } else {
                 // We are pausing while running. Cancel the animation and wait

Modified: branches/chromium/1180/Source/WebCore/page/animation/AnimationController.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/page/animation/AnimationController.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/page/animation/AnimationController.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -100,7 +100,7 @@
                 timeToNextService = t;
             if (!timeToNextService) {
                 if (callSetChanged == CallSetChanged) {
-                    Node* node = it->first->styledGeneratingNode();
+                    Node* node = it->first->node();
                     ASSERT(!node || (node->document() && !node->document()->inPageCache()));
                     node->setNeedsStyleRecalc(SyntheticStyleChange);
                     calledSetChanged = true;
@@ -328,7 +328,7 @@
         return false;
 
     if (compAnim->pauseAnimationAtTime(name, t)) {
-        renderer->styledGeneratingNode()->setNeedsStyleRecalc(SyntheticStyleChange);
+        renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
         startUpdateStyleIfNeededDispatcher();
         return true;
     }
@@ -346,7 +346,7 @@
         return false;
 
     if (compAnim->pauseTransitionAtTime(cssPropertyID(property), t)) {
-        renderer->styledGeneratingNode()->setNeedsStyleRecalc(SyntheticStyleChange);
+        renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
         startUpdateStyleIfNeededDispatcher();
         return true;
     }
@@ -508,7 +508,7 @@
         return;
 
     if (m_data->clear(renderer)) {
-        Node* node = renderer->styledGeneratingNode();
+        Node* node = renderer->node();
         ASSERT(!node || (node->document() && !node->document()->inPageCache()));
         node->setNeedsStyleRecalc(SyntheticStyleChange);
     }
@@ -533,6 +533,7 @@
     // against the animations in the style and make sure we're in sync.  If destination values
     // have changed, we reset the animation.  We then do a blend to get new values and we return
     // a new style.
+    ASSERT(renderer->node()); // FIXME: We do not animate generated content yet.
 
     RefPtr<CompositeAnimation> rendererAnimations = m_data->accessCompositeAnimation(renderer);
     RefPtr<RenderStyle> blendedStyle = rendererAnimations->animate(renderer, oldStyle, newStyle);

Modified: branches/chromium/1180/Source/WebCore/page/animation/ImplicitAnimation.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/page/animation/ImplicitAnimation.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/page/animation/ImplicitAnimation.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -129,7 +129,7 @@
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 void ImplicitAnimation::endAnimation()
@@ -165,8 +165,8 @@
                 
             // Dispatch the event
             RefPtr<Element> element = 0;
-            if (m_object->styledGeneratingNode() && m_object->styledGeneratingNode()->isElementNode())
-                element = static_cast<Element*>(m_object->styledGeneratingNode());
+            if (m_object->node() && m_object->node()->isElementNode())
+                element = static_cast<Element*>(m_object->node());
 
             ASSERT(!element || (element->document() && !element->document()->inPageCache()));
             if (!element)

Modified: branches/chromium/1180/Source/WebCore/page/animation/KeyframeAnimation.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/page/animation/KeyframeAnimation.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/page/animation/KeyframeAnimation.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -51,8 +51,8 @@
     , m_unanimatedStyle(unanimatedStyle)
 {
     // Get the keyframe RenderStyles
-    if (m_object && m_object->styledGeneratingNode() && m_object->styledGeneratingNode()->isElementNode())
-        m_object->document()->styleResolver()->keyframeStylesForAnimation(static_cast<Element*>(m_object->styledGeneratingNode()), unanimatedStyle, m_keyframes);
+    if (m_object && m_object->node() && m_object->node()->isElementNode())
+        m_object->document()->styleResolver()->keyframeStylesForAnimation(static_cast<Element*>(m_object->node()), unanimatedStyle, m_keyframes);
 
     // Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
     validateTransformFunctionList();
@@ -255,7 +255,7 @@
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 void KeyframeAnimation::endAnimation()
@@ -269,7 +269,7 @@
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 bool KeyframeAnimation::shouldSendEventForListener(Document::ListenerType listenerType) const
@@ -314,8 +314,8 @@
     if (shouldSendEventForListener(listenerType)) {
         // Dispatch the event
         RefPtr<Element> element;
-        if (m_object->styledGeneratingNode() && m_object->styledGeneratingNode()->isElementNode())
-            element = static_cast<Element*>(m_object->styledGeneratingNode());
+        if (m_object->node() && m_object->node()->isElementNode())
+            element = static_cast<Element*>(m_object->node());
 
         ASSERT(!element || (element->document() && !element->document()->inPageCache()));
         if (!element)

Modified: branches/chromium/1180/Source/WebCore/rendering/RenderBlock.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/rendering/RenderBlock.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/rendering/RenderBlock.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -6086,13 +6086,12 @@
         firstLetter->destroy();
         firstLetter = newFirstLetter;
         firstLetterContainer->addChild(firstLetter, nextSibling);
-    }
+    } else
+        firstLetter->setStyle(pseudoStyle);
 
-    firstLetter->setAnimatableStyle(pseudoStyle);
-
     for (RenderObject* genChild = firstLetter->firstChild(); genChild; genChild = genChild->nextSibling()) {
         if (genChild->isText())
-            genChild->setStyle(firstLetter->style());
+            genChild->setStyle(pseudoStyle);
     }
 }
 
@@ -6105,13 +6104,8 @@
         firstLetter = new (renderArena()) RenderInline(document());
     else
         firstLetter = new (renderArena()) RenderBlock(document());
-
-    RefPtr<RenderStyle> temporaryStyle = RenderStyle::create();
-    temporaryStyle->inheritFrom(firstLetterBlock->style());
-    firstLetter->setStyle(temporaryStyle);  
+    firstLetter->setStyle(pseudoStyle);
     firstLetterContainer->addChild(firstLetter, currentChild);
-    
-    firstLetter->setAnimatableStyle(pseudoStyle);
 
     RenderText* textObj = toRenderText(currentChild);
 
@@ -6159,7 +6153,7 @@
         // construct text fragment for the first letter
         RenderTextFragment* letter = 
             new (renderArena()) RenderTextFragment(remainingText->node() ? remainingText->node() : remainingText->document(), oldText.get(), 0, length);
-        letter->setStyle(firstLetter->style());
+        letter->setStyle(pseudoStyle);
         firstLetter->addChild(letter);
 
         textObj->destroy();

Modified: branches/chromium/1180/Source/WebCore/rendering/RenderInline.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/rendering/RenderInline.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/rendering/RenderInline.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -953,8 +953,8 @@
 
 LayoutRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const
 {
-    // Only run-ins and first-letter elements are allowed in here during layout.
-    ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn() || style()->styleType() == FIRST_LETTER);
+    // Only run-ins are allowed in here during layout.
+    ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn());
 
     if (!firstLineBoxIncludingCulling() && !continuation())
         return LayoutRect();

Modified: branches/chromium/1180/Source/WebCore/rendering/RenderObject.cpp (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/rendering/RenderObject.cpp	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/rendering/RenderObject.cpp	2012-07-10 19:02:06 UTC (rev 122241)
@@ -2155,21 +2155,6 @@
     return true;
 }
 
-Node* RenderObject::styledGeneratingNode() const
-{
-    Node* node = generatingNode();
-    if (node)
-        return node;
-
-    for (RenderObject* object = parent(); object; object = object->parent()) {
-        if (Node* node = object->generatingNode())
-            return node;
-    }
-
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
 RenderObject* RenderObject::rendererForRootBackground()
 {
     ASSERT(isRoot());

Modified: branches/chromium/1180/Source/WebCore/rendering/RenderObject.h (122240 => 122241)


--- branches/chromium/1180/Source/WebCore/rendering/RenderObject.h	2012-07-10 18:48:43 UTC (rev 122240)
+++ branches/chromium/1180/Source/WebCore/rendering/RenderObject.h	2012-07-10 19:02:06 UTC (rev 122241)
@@ -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.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to