Changeset 155105 in webkit

Timestamp:

Sep 5, 2013 12:38:46 AM (11 years ago)

Author:

krit@webkit.org

Message:

NULL ptr in WebCore::RefCountedPropertyWrapper<WebCore::ClipPathOperation>::blend
​https://bugs.webkit.org/show_bug.cgi?id=105408

Reviewed by Dean Jackson.

Source/WebCore:

Adding an early return if from or to clip-path values are 'none'. According to the
specification we shall just interpolate between two basic shapes.

​http://dev.w3.org/csswg/css-shapes/#basic-shape-interpolation

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

LayoutTests:

Test that animation from none to a basic shape on -webkit-clip-path doesn't crash.

• css3/masking/clip-path-animation-expected.txt:
• css3/masking/clip-path-animation.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/masking/clip-path-animation-expected.txt (modified) (1 diff)
• LayoutTests/css3/masking/clip-path-animation.html (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/CSSPropertyAnimation.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-05  Dirk Schulze  <krit@webkit.org>
+
+        NULL ptr in WebCore::RefCountedPropertyWrapper<WebCore::ClipPathOperation>::blend
+        https://bugs.webkit.org/show_bug.cgi?id=105408
+
+        Reviewed by Dean Jackson.
+
+        Test that animation from none to a basic shape on -webkit-clip-path doesn't crash.
+
+        * css3/masking/clip-path-animation-expected.txt:
+        * css3/masking/clip-path-animation.html:
+
 2013-09-04  Dirk Schulze  <krit@webkit.org>
 

trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt

@@ -1 @@
-   
+    
 PASS - "webkitClipPath" property for "rectangle-box" element at 1s saw something close to: rectangle(10%, 10%, 80%, 80%, 0px, 0px)
 PASS - "webkitClipPath" property for "circle-box" element at 1s saw something close to: circle(35%, 35%, 35%)
 PASS - "webkitClipPath" property for "ellipse-box" element at 1s saw something close to: ellipse(35%, 35%, 35%, 30%)
 PASS - "webkitClipPath" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
+PASS - "webkitClipPath" property for "none-box" element at 1s saw something close to: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)
 

trunk/LayoutTests/css3/masking/clip-path-animation.html

@@ -28 +28 @@
     }
 
+    #none-box {
+      -webkit-animation: none-anim 2s linear
+    }
 
     @-webkit-keyframes rectangle-anim {
@@ -49 +52 @@
     }
 
+    @-webkit-keyframes none-anim {
+        /* We do not support animations from or to 'none' as specified. */
+        from { -webkit-clip-path: none; }
+        to   { -webkit-clip-path: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%); }
+    }
+
   </style>
   <script src="../../animations/resources/animation-test-helpers.js"></script>
@@ -58 +67 @@
       ["ellipse-anim",  1, "ellipse-box", "webkitClipPath", "ellipse(35%, 35%, 35%, 30%)", 0.05],
       ["polygon-anim",  1, "polygon-box", "webkitClipPath", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
+      ["none-anim",  1, "none-box", "webkitClipPath", "polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)", 0],
     ];
     
@@ -69 +79 @@
 <div class="box" id="ellipse-box"></div>
 <div class="box" id="polygon-box"></div>
+<div class="box" id="none-box"></div>
 
 <div id="result">

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-05  Dirk Schulze  <krit@webkit.org>
+
+        NULL ptr in WebCore::RefCountedPropertyWrapper<WebCore::ClipPathOperation>::blend
+        https://bugs.webkit.org/show_bug.cgi?id=105408
+
+        Reviewed by Dean Jackson.
+
+        Adding an early return if from or to clip-path values are 'none'. According to the
+        specification we shall just interpolate between two basic shapes.
+
+        http://dev.w3.org/csswg/css-shapes/#basic-shape-interpolation
+
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::blendFunc):
+
 2013-09-05  Andre Moreira Magalhaes   <andre.magalhaes@collabora.co.uk>
 

trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

@@ -134 +134 @@
 static inline PassRefPtr<ClipPathOperation> blendFunc(const AnimationBase*, ClipPathOperation* from, ClipPathOperation* to, double progress)
 {
+    if (!from || !to)
+        return to;
+
     // Other clip-path operations than BasicShapes can not be animated.
     if (from->getOperationType() != ClipPathOperation::SHAPE || to->getOperationType() != ClipPathOperation::SHAPE)