[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
morrita at google.com
morrita at google.com
Wed Dec 22 12:19:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0e4802eda1b8dd5eedc278176c69c55be9a10510
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 19 02:14:38 2010 +0000
2010-08-17 MORITA Hajime <morrita at google.com>
Reviewed by Tony Chang.
[Chromium] editing/pasteboard/drop-text-events.html failed.
https://bugs.webkit.org/show_bug.cgi?id=44051
* editing/pasteboard/drop-text-events-expected.txt:
* editing/pasteboard/script-tests/drop-text-events.js: Supressed side effect during a drag.
* platform/chromium/test_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65648 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b352105..d1e20dd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-17 MORITA Hajime <morrita at google.com>
+
+ Reviewed by Tony Chang.
+
+ [Chromium] editing/pasteboard/drop-text-events.html failed.
+ https://bugs.webkit.org/show_bug.cgi?id=44051
+
+ * editing/pasteboard/drop-text-events-expected.txt:
+ * editing/pasteboard/script-tests/drop-text-events.js: Supressed side effect during a drag.
+ * platform/chromium/test_expectations.txt:
+
2010-08-18 Beth Dakin <bdakin at apple.com>
Reviewed by Sam Weinig.
diff --git a/LayoutTests/editing/pasteboard/drop-text-events-expected.txt b/LayoutTests/editing/pasteboard/drop-text-events-expected.txt
index cdddb75..23a63d3 100644
--- a/LayoutTests/editing/pasteboard/drop-text-events-expected.txt
+++ b/LayoutTests/editing/pasteboard/drop-text-events-expected.txt
@@ -3,30 +3,30 @@ This tests that Drag drop fires textInput events.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS event.data is 'PlainHello'
+PASS actualTextEventData is 'PlainHello'
PASS testTargetTextarea.value is 'PlainHello'
-PASS event.data is 'PlainHello'
+PASS actualTextEventData is 'PlainHello'
PASS testTargetInput.value is 'PlainHello'
-PASS event.data is ''
+PASS actualTextEventData is ''
PASS 0 <= testTargetEditable.innerHTML.indexOf('PlainHello') is true
-PASS event.data is 'RichHello'
+PASS actualTextEventData is 'RichHello'
PASS testTargetTextarea.value is 'RichHello'
-PASS event.data is 'RichHello'
+PASS actualTextEventData is 'RichHello'
PASS testTargetInput.value is 'RichHello'
-PASS event.data is ''
+PASS actualTextEventData is ''
PASS 0 <= testTargetEditable.innerHTML.indexOf('<b>Rich</b>Hello') is true
PASS textInputCount is proceedingTestCases.length
-PASS event.data is 'PlainHello'
+PASS actualTextEventData is 'PlainHello'
PASS testTargetTextarea.value is ''
-PASS event.data is 'PlainHello'
+PASS actualTextEventData is 'PlainHello'
PASS testTargetInput.value is ''
-PASS event.data is ''
+PASS actualTextEventData is ''
PASS testTargetEditable.innerHTML is 'placeholder'
-PASS event.data is 'RichHello'
+PASS actualTextEventData is 'RichHello'
PASS testTargetTextarea.value is ''
-PASS event.data is 'RichHello'
+PASS actualTextEventData is 'RichHello'
PASS testTargetInput.value is ''
-PASS event.data is ''
+PASS actualTextEventData is ''
PASS testTargetEditable.innerHTML is 'placeholder'
PASS textInputCount is cancelingTestCases.length
PASS successfullyParsed is true
diff --git a/LayoutTests/editing/pasteboard/script-tests/drop-text-events.js b/LayoutTests/editing/pasteboard/script-tests/drop-text-events.js
index eeb5488..257f735 100644
--- a/LayoutTests/editing/pasteboard/script-tests/drop-text-events.js
+++ b/LayoutTests/editing/pasteboard/script-tests/drop-text-events.js
@@ -8,10 +8,11 @@ function toStringLiteral(str)
var willCancelTextInput = false;
var textInputCount = 0;
var expectedTextEventData = "";
+var actualTextEventData = null;
function droppingTextInputHandler(evt)
{
- shouldBe("event.data", toStringLiteral(expectedTextEventData));
+ actualTextEventData = evt.data;
textInputCount++;
if (willCancelTextInput)
evt.preventDefault();
@@ -40,6 +41,7 @@ function clearTargets()
testTargetEditable.innerHTML = "placeholder"; // give some text to have an area to drop
testTargetInput.value = "";
testTargetTextarea.value = "";
+ actualTextEventData = null;
}
function dragFrom(element)
@@ -149,6 +151,7 @@ function runSingleTest(caseData)
clearTargets();
drag();
drop();
+ shouldBe("actualTextEventData", toStringLiteral(expectedTextEventData));
verifyFunction(verifyParameter);
}
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index d46e501..3886467 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3201,9 +3201,6 @@ BUGJAPHET MAC : fast/canvas/webgl/texture-npot.html = TEXT
// Fails since r65370. Render tree output is different from upstream's one.
BUGYUTAK WIN LINUX : svg/W3C-SVG-1.1/animate-elem-80-t.svg = TEXT
-// Due to http://trac.webkit.org/changeset/65395
-BUGWK44051 : editing/pasteboard/drop-text-events.html = TEXT
-
// Probably http://trac.webkit.org/changeset/65381
// This test causes the next one to run to ASSERT
BUGWK44079 DEBUG SKIP : fast/events/popup-allowed-from-gesture-initiated-form-submit.html = PASS
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list