[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 18:06:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e543e5e69724500b866ce39a57fb8ef1e6eb82b0
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 7 13:29:05 2010 +0000
Unreviewed. Rolling out r73421, because it made transitions/color-transition-all.html flakey.
WebCore:
* page/animation/AnimationBase.cpp:
(WebCore::addShorthandProperties):
LayoutTests:
* transitions/border-radius-transition-expected.txt: Removed.
* transitions/border-radius-transition.html: Removed.
* transitions/color-transition-all.html:
* transitions/transition-test-helpers.js:
(expected):
* transitions/zero-duration-in-list.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73438 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4b0b59b..3ac5808 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-07 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed. Rolling out r73421, because it made transitions/color-transition-all.html flakey.
+
+ * transitions/border-radius-transition-expected.txt: Removed.
+ * transitions/border-radius-transition.html: Removed.
+ * transitions/color-transition-all.html:
+ * transitions/transition-test-helpers.js:
+ (expected):
+ * transitions/zero-duration-in-list.html:
+
2010-12-07 Martin Robinson <mrobinson at igalia.com>
Rebaseline GTK+ results after r73385.
diff --git a/LayoutTests/transitions/border-radius-transition-expected.txt b/LayoutTests/transitions/border-radius-transition-expected.txt
deleted file mode 100644
index 5cbd1bf..0000000
--- a/LayoutTests/transitions/border-radius-transition-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-PASS - "border-top-left-radius" property for "box" element at 0.25s saw something close to: 25
-PASS - "-webkit-border-top-left-radius" property for "box2" element at 0.25s saw something close to: 25
-
diff --git a/LayoutTests/transitions/border-radius-transition.html b/LayoutTests/transitions/border-radius-transition.html
deleted file mode 100644
index e0a2223..0000000
--- a/LayoutTests/transitions/border-radius-transition.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE>
-
-<html lang="en">
-<head>
- <style type="text/css" media="screen">
- .box {
- height: 100px;
- width: 100px;
- margin: 10px;
- border: 3px solid blue;
- -webkit-transition-duration: 0.5s;
- -webkit-transition-timing-function: linear;
- }
-
- #box {
- -webkit-transition-property: border-radius;
- }
-
- #box.final {
- border-top-left-radius: 50px;
- }
-
- #box2 {
- -webkit-transition-property: -webkit-border-radius;
- }
-
- #box2.final {
- -webkit-border-top-left-radius: 50px;
- }
-
- </style>
- <script src="transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
- <script type="text/javascript" charset="utf-8">
-
- const expectedValues = [
- // [time, element-id, property, expected-value, tolerance]
- [0.25, 'box', 'border-top-left-radius', 25, 2],
- [0.25, 'box2', '-webkit-border-top-left-radius', 25, 2],
- ];
-
- function setupTest()
- {
- document.getElementById('box').className = 'box final';
- document.getElementById('box2').className = 'box final';
- }
-
- var usePauseAPI = false; // the pause API does not work with shorthands.
- runTransitionTest(expectedValues, setupTest, usePauseAPI);
- </script>
-</head>
-<body>
-
- <div id="box" class="box"></div>
- <div id="box2" class="box"></div>
-
- <div id="result">
- </div>
-
-</body>
-</html>
diff --git a/LayoutTests/transitions/color-transition-all.html b/LayoutTests/transitions/color-transition-all.html
index 9698312..8676a32 100644
--- a/LayoutTests/transitions/color-transition-all.html
+++ b/LayoutTests/transitions/color-transition-all.html
@@ -32,8 +32,7 @@
document.getElementById('outer').className = 'changed';
}
- var usePauseAPI = false;
- runTransitionTest(expectedValues, setupTest, usePauseAPI);
+ runTransitionTest(expectedValues, setupTest, true);
</script>
</head>
<body>
diff --git a/LayoutTests/transitions/transition-test-helpers.js b/LayoutTests/transitions/transition-test-helpers.js
index 5a0b340..b23be12 100644
--- a/LayoutTests/transitions/transition-test-helpers.js
+++ b/LayoutTests/transitions/transition-test-helpers.js
@@ -168,9 +168,7 @@ function runTest(expected, usePauseAPI)
// We can only use the transition fast-forward mechanism if DRT implements pauseTransitionAtTimeOnElementWithId()
if (hasPauseTransitionAPI && usePauseAPI) {
- var paused = layoutTestController.pauseTransitionAtTimeOnElementWithId(property, time, elementId);
- if (!paused)
- window.console.log("Failed to pause '" + property + "' transition on element '" + elementId + "'");
+ layoutTestController.pauseTransitionAtTimeOnElementWithId(property, time, elementId);
checkExpectedValue(expected, i);
} else {
if (time > maxTime)
diff --git a/LayoutTests/transitions/zero-duration-in-list.html b/LayoutTests/transitions/zero-duration-in-list.html
index ed940af..fbe2f5c 100644
--- a/LayoutTests/transitions/zero-duration-in-list.html
+++ b/LayoutTests/transitions/zero-duration-in-list.html
@@ -32,8 +32,8 @@
box.style.left = '100px';
}
- var usePauseAPI = false;
- runTransitionTest(expectedValues, setupTest, usePauseAPI);
+ runTransitionTest(expectedValues, setupTest, true);
+
</script>
</head>
<body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a148fa4..4b6cbeb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-07 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed. Rolling out r73421, because it made transitions/color-transition-all.html flakey.
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::addShorthandProperties):
+
2010-12-07 Martin Robinson <mrobinson at igalia.com>
Unreviewed, rolling out r73392.
diff --git a/WebCore/page/animation/AnimationBase.cpp b/WebCore/page/animation/AnimationBase.cpp
index d5616a8..66172f7 100644
--- a/WebCore/page/animation/AnimationBase.cpp
+++ b/WebCore/page/animation/AnimationBase.cpp
@@ -734,7 +734,6 @@ static void addShorthandProperties()
CSSPropertyBorderColor,
CSSPropertyBorderWidth,
CSSPropertyBorder,
- CSSPropertyBorderRadius,
CSSPropertyBorderSpacing,
CSSPropertyMargin,
CSSPropertyOutline,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list