[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mjs at apple.com
mjs at apple.com
Sun Feb 20 23:13:39 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 1e83c5462d6cd048171e6177d38a74c3fb5f7c53
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 19 03:30:46 2011 +0000
Not reviewed.
Revert inadvertantly committed test changes.
* editing/pasteboard/copy-null-characters.html:
* fast/events/scroll-event-does-not-bubble.html:
* platform/mac-wk2/Skipped:
* transitions/remove-transition-style.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 73e783e..7ee7583 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-18 Maciej Stachowiak <mjs at apple.com>
+
+ Not reviewed.
+
+ Revert inadvertantly committed test changes.
+
+ * editing/pasteboard/copy-null-characters.html:
+ * fast/events/scroll-event-does-not-bubble.html:
+ * platform/mac-wk2/Skipped:
+ * transitions/remove-transition-style.html:
+
2011-01-18 Oliver Hunt <oliver at apple.com>
Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/editing/pasteboard/copy-null-characters.html b/LayoutTests/editing/pasteboard/copy-null-characters.html
index 8ee26d6..c92ab8b 100644
--- a/LayoutTests/editing/pasteboard/copy-null-characters.html
+++ b/LayoutTests/editing/pasteboard/copy-null-characters.html
@@ -18,7 +18,6 @@ function runTest()
var destinationRichText = document.getElementById("destination-rich-text");
sel.setPosition(destinationRichText, 0);
document.execCommand("Paste");
- alert(destinationRichText.innerHTML);
var destinationPlainText = document.getElementById("destination-plain-text");
destinationPlainText.focus();
@@ -30,8 +29,6 @@ function runTest()
results.innerText = "Plain text field has the wrong value (expected " +
JSON.stringify(expectedPlainTextValue) + " but found " +
JSON.stringify(destinationPlainText.value) + ").";
- Markup.dump(document.body);
- Markup.notifyDone();
return;
}
@@ -55,8 +52,6 @@ function runTest()
results.innerText = "Plain text field has the wrong value (expected " +
JSON.stringify(expectedPlainTextValue2) + " but found " +
JSON.stringify(destinationPlainText.value) + ").";
- Markup.dump(document.body);
- Markup.notifyDone();
return;
}
diff --git a/LayoutTests/fast/events/scroll-event-does-not-bubble.html b/LayoutTests/fast/events/scroll-event-does-not-bubble.html
index 0686350..1e85113 100644
--- a/LayoutTests/fast/events/scroll-event-does-not-bubble.html
+++ b/LayoutTests/fast/events/scroll-event-does-not-bubble.html
@@ -14,9 +14,6 @@ function divScrolled() {
document.getElementById('result').innerHTML = 'SUCCESS: div.onscroll was called, but window.onscroll was not.';
// Don't call notifyDone straight away, in case there's another scroll event coming/bubbling.
doneTimeout = setTimeout(function() {
-
- // Don't pollute the test result with nonsense.
- document.getElementById('container').innerHTML = '';
if (window.layoutTestController)
layoutTestController.notifyDone();
}, 100);
@@ -35,6 +32,9 @@ function runTest() {
div.onscroll = divScrolled;
window.onscroll = windowScrolled;
div.scrollByLines(1);
+
+ // Don't pollute the test result with nonsense.
+ div.innerHTML = '';
}
</script>
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index 7239146..087bd26 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -976,7 +976,6 @@ java
# WebKit2 needs layoutTestController.overridePreference
# <https://bugs.webkit.org/show_bug.cgi?id=42197>
-http/tests/navigation/go-back-to-error-page.html
http/tests/navigation/ping-cookie.html
plugins/application-plugin-plugins-disabled.html
fast/canvas/webgl/context-lost-restored.html
@@ -1085,7 +1084,6 @@ media/restore-from-page-cache.html
# Pasteboard doesn't work in WebKit2
# <https://bugs.webkit.org/show_bug.cgi?id=42317>
-editing/pasteboard/copy-null-characters.html
editing/execCommand/4128080-2.html
editing/execCommand/5939887.html
editing/execCommand/copy-without-selection.html
@@ -2335,24 +2333,3 @@ http/tests/media/video-buffered.html
# These require DRT setSerializeHTTPLoads implementation for WebKit2 to be reliable.
http/tests/local/link-stylesheet-load-order.html
http/tests/local/link-stylesheet-load-order-preload.html
-
-
-# Transitions sometimes don't stop when they should
-transitions/hang-with-bad-transition-list.html
-transitions/remove-transition-style.html
-transitions/repeated-firing-background-color.html
-transitions/zero-duration-with-non-zero-delay-end.html
-
-
-# CSSValue and CSSPrimitiveValue prototypes are wrong
-fast/dom/global-constructors.html
-
-# WebKit2 doesn't support tiled layers
-compositing/tiling/huge-layer-resize.html
-
-# Unexplained plugin failures
-plugins/destroy-reentry.html
-platform/mac/plugins/testplugin-onnew-onpaint.html
-plugins/destroy-stream-twice.html
-plugins/embed-inside-object.html
-plugins/no-mime-with-valid-extension.html
diff --git a/LayoutTests/transitions/remove-transition-style.html b/LayoutTests/transitions/remove-transition-style.html
index 548d615..371f81e 100644
--- a/LayoutTests/transitions/remove-transition-style.html
+++ b/LayoutTests/transitions/remove-transition-style.html
@@ -51,7 +51,6 @@
function startTransition()
{
var box = document.getElementById('box');
- box.addEventListener("webkitTransitionEnd", function() { alert("end"); }, false);
box.className = 'animated';
window.setTimeout(function() {
box.style.opacity = '0.5';
@@ -68,4 +67,4 @@
<div id="results"></div>
</body>
-</html>
+</html>
\ No newline at end of file
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list