[webkit-changes] [151707] trunk/Source/WebCore

[commit-queue]

Title: [151707] trunk/Source/WebCore

Revision

151707

Author

commit-qu...@webkit.org

Date

2013-06-18 16:39:44 -0700 (Tue, 18 Jun 2013)

Log Message

Unreviewed, rolling out r151513.
http://trac.webkit.org/changeset/151513
https://bugs.webkit.org/show_bug.cgi?id=117763

It causes assertions in debug (Requested by benjaminp on
#webkit).

* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::startAnimation):
(WebCore::RenderLayerBacking::startTransition):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (151706 => 151707)

--- trunk/Source/WebCore/ChangeLog	2013-06-18 23:16:34 UTC (rev 151706)
+++ trunk/Source/WebCore/ChangeLog	2013-06-18 23:39:44 UTC (rev 151707)
@@ -1,3 +1,16 @@
+2013-06-18  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r151513.
+        http://trac.webkit.org/changeset/151513
+        https://bugs.webkit.org/show_bug.cgi?id=117763
+
+        It causes assertions in debug (Requested by benjaminp on
+        #webkit).
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::startAnimation):
+        (WebCore::RenderLayerBacking::startTransition):
+
 2013-06-18  Roger Fong  <roger_f...@apple.com>
 
         Replace tools32 folder with tools and update WebKit Windows solution accordingly.

Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (151706 => 151707)

--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2013-06-18 23:16:34 UTC (rev 151706)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2013-06-18 23:39:44 UTC (rev 151707)
@@ -2121,7 +2121,7 @@
 
 #if ENABLE(CSS_FILTERS)
         if ((hasFilter && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyWebkitFilter))
-            filterVector.insert(FilterAnimationValue::create(key, owningLayer()->computeFilterOperations(keyframeStyle), tf));
+            filterVector.insert(FilterAnimationValue::create(key, keyframeStyle->filter(), tf));
 #endif
     }
 
@@ -2191,8 +2191,8 @@
         const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
         if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
             KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
-            filterVector.insert(FilterAnimationValue::create(0, owningLayer()->computeFilterOperations(fromStyle)));
-            filterVector.insert(FilterAnimationValue::create(1, owningLayer()->computeFilterOperations(toStyle)));
+            filterVector.insert(FilterAnimationValue::create(0, fromStyle->filter()));
+            filterVector.insert(FilterAnimationValue::create(1, toStyle->filter()));
             if (m_graphicsLayer->addAnimation(filterVector, IntSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
                 // To ensure that the correct filter is visible when the animation ends, also set the final filter.
                 updateFilters(toStyle);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes