Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / animations / resources / animation-test-helpers.js

diff --git a/src/third_party/WebKit/LayoutTests/animations/resources/animation-test-helpers.js b/src/third_party/WebKit/LayoutTests/animations/resources/animation-test-helpers.js
index d7f6070..6508883 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/animations/resources/animation-test-helpers.js
+++ b/src/third_party/WebKit/LayoutTests/animations/resources/animation-test-helpers.js
@@ -289,7 +289,7 @@ function checkExpectedTransitionValue(expected, index)
                     break;
             }
         }
-    } else if (property === "shape-inside" || property === "shape-outside") {
+    } else if (property === "shape-outside") {
         computedValue = window.getComputedStyle(document.getElementById(elementId)).getPropertyValue(property);
         var actualShape = parseBasicShape(computedValue);
         var expectedShape = parseBasicShape(expectedValue);
@@ -390,7 +390,6 @@ function getPropertyValue(property, elementId, iframeId)
                || property == "webkitMaskBoxImage"
                || property == "webkitFilter"
                || property == "webkitClipPath"
-               || property == "shapeInside"
                || !property.indexOf("webkitTransform")) {
         computedValue = window.getComputedStyle(element)[property.split(".")[0]];
     } else {
@@ -427,7 +426,7 @@ function comparePropertyValue(property, computedValue, expectedValue, tolerance)
         var filterParameters = getFilterParameters(computedValue);
         var filter2Parameters = getFilterParameters(expectedValue);
         result = filterParametersMatch(filterParameters, filter2Parameters, tolerance);
-    } else if (property == "webkitClipPath" || property == "shapeInside") {
+    } else if (property == "webkitClipPath") {
         var clipPathParameters = parseBasicShape(computedValue);
         var clipPathParameters2 = parseBasicShape(expectedValue);
         if (!clipPathParameters || !clipPathParameters2)