[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
bweinstein at apple.com
bweinstein at apple.com
Thu Apr 8 01:06:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 466d03c908829e818d247436c19aa979c693928e
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 14 18:47:50 2010 +0000
Roll out r53270 because it broke 5 layout tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 19f78d9..4550263 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,19 +1,3 @@
-2010-01-14 Brian Weinstein <bweinstein at apple.com>
-
- Reviewed by Oliver Hunt.
-
- [DnD] effectAllowed and dropEffect can be set to bogus values.
- Fixes <https://bugs.webkit.org/show_bug.cgi?id=33635>.
-
- Added a test to check the handling of setting effectAllowed and
- dropEffect to bogus values (that it gets ignored), and updated results
- to drag-and-drop because it uses a dummy value.
-
- * fast/events/bogus-dropEffect-effectAllowed-expected.txt: Added.
- * fast/events/bogus-dropEffect-effectAllowed.html: Added.
- * fast/events/drag-and-drop-expected.txt:
- * fast/events/drag-and-drop.html:
-
2010-01-14 Adam Roben <aroben at apple.com>
Fix a typo in editing/selection/inactive-selection.html
diff --git a/LayoutTests/fast/events/bogus-dropEffect-effectAllowed-expected.txt b/LayoutTests/fast/events/bogus-dropEffect-effectAllowed-expected.txt
deleted file mode 100644
index e7c555f..0000000
--- a/LayoutTests/fast/events/bogus-dropEffect-effectAllowed-expected.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-This test checks that effectAllowed and dropEffect cannot be set to values that aren't defined in the spec
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS event.dataTransfer.effectAllowed is "all"
-PASS event.dataTransfer.effectAllowed is "copy"
-PASS event.dataTransfer.effectAllowed is "copy"
-PASS event.dataTransfer.effectAllowed is "copyLink"
-PASS event.dataTransfer.effectAllowed is "copyLink"
-PASS event.dataTransfer.effectAllowed is "copyMove"
-PASS event.dataTransfer.effectAllowed is "copyMove"
-PASS event.dataTransfer.effectAllowed is "link"
-PASS event.dataTransfer.effectAllowed is "linkMove"
-PASS event.dataTransfer.effectAllowed is "move"
-PASS event.dataTransfer.effectAllowed is "none"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "link"
-PASS event.dataTransfer.dropEffect is "link"
-PASS event.dataTransfer.dropEffect is "move"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.dropEffect is "link"
-PASS event.dataTransfer.dropEffect is "link"
-PASS event.dataTransfer.dropEffect is "move"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html b/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html
deleted file mode 100644
index 92e49ac..0000000
--- a/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
-<style>
-#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
-#dropTarget {width: 256px; height: 256px; border: 1px dashed}
-#dragMe {-webkit-user-drag: element; -webkit-user-select: none; background: #ff0000; width: 64px; height: 64px; color: white}
-</style>
-<script>
- var dragMe;
- var dropTarget;
- var effectAllowedElem;
- var dropEffectElem;
- var consoleElm;
- var event;
-
- window.onload = function()
- {
- dragMe = document.getElementById("dragMe");
- dropTarget = document.getElementById("dropTarget");
- consoleElm = document.getElementById("console");
-
- if (!dragMe || !dropTarget || !consoleElm)
- return;
-
- dragMe.ondragstart = dragStart;
- dragMe.ondragend = dragEnd;
-
- dropTarget.ondragenter = dragEntered;
- dropTarget.ondragover = dragOver;
- dropTarget.ondrop = drop;
-
- runTest();
- }
-
- function dragStart(e)
- {
- var validEffectAllowedList = ["all", "copy", "copyLink", "copyMove", "link", "linkMove", "move", "none", "uninitialized"];
- var effectAllowedListToTest = ["all", "copy", "bogus", "copyLink", "wrong", "copyMove", "linkCopyMove", "link",
- "linkMove", "move", "none", "uninitialized", "dummy", "bogus", "fake", "illegal"];
-
- event = e;
-
- for (var i = 0; i < effectAllowedListToTest.length; i++) {
- var effectAllowedBefore = e.dataTransfer.effectAllowed;
- e.dataTransfer.effectAllowed = effectAllowedListToTest[i];
- if (validEffectAllowedList.indexOf(effectAllowedListToTest[i]) != -1)
- shouldBeEqualToString("event.dataTransfer.effectAllowed", effectAllowedListToTest[i]);
- else
- shouldBeEqualToString("event.dataTransfer.effectAllowed", effectAllowedBefore);
- }
-
- e.dataTransfer.setData('Text', e.target.textContent);
- }
-
- function dragEnd(e)
- {
- return;
- }
-
- function dragEntered(e)
- {
- dragEnteredAndUpdated(e);
- }
-
- function dragOver(e)
- {
- dragEnteredAndUpdated(e);
- }
-
- function dragEnteredAndUpdated(e)
- {
- var validDropEffectList = ["none", "copy", "link", "move", "link"];
- var dropEffectListToTest = ["all", "copy", "bogus", "copyLink", "wrong", "copyMove", "linkCopyMove", "link",
- "linkMove", "move", "none", "uninitialized", "dummy", "bogus", "fake", "illegal"];
-
- event = e;
-
- for (var i = 0; i < dropEffectListToTest.length; i++) {
- var dropEffectBefore = e.dataTransfer.dropEffect;
- e.dataTransfer.dropEffect = dropEffectListToTest[i];
-
- if (validDropEffectList.indexOf(dropEffectListToTest[i]) != -1)
- shouldBeEqualToString("event.dataTransfer.dropEffect", dropEffectListToTest[i]);
- else
- shouldBeEqualToString("event.dataTransfer.dropEffect", dropEffectBefore);
-
- }
-
- cancelDrag(e);
- }
-
- function drop(e)
- {
- cancelDrag(e);
- }
-
- function cancelDrag(e)
- {
- e.preventDefault();
- }
-
- function runTest()
- {
- if (!window.eventSender)
- return;
-
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- var startX = dragMe.offsetLeft + 10;
- var startY = dragMe.offsetTop + dragMe.offsetHeight / 2;
- var endX = dropTarget.offsetLeft + 10;
- var endY = dropTarget.offsetTop + dropTarget.offsetHeight / 2;
-
- eventSender.mouseMoveTo(startX, startY);
- eventSender.mouseDown();
- eventSender.leapForward(100);
- eventSender.mouseMoveTo(endX, endY);
- eventSender.mouseUp();
-
- var testContainer = document.getElementById("test-container");
- if (testContainer)
- document.body.removeChild(testContainer);
- debug('<br /><span class="pass">TEST COMPLETE</span>');
- }
-</script>
-</head>
-<body>
- <p id="description"></p>
- <div id="test-container">
- <br/><br/>
- <div id="dropTarget">Drop the red square onto me.<br/><br/></div>
- <hr/>
- <p>Items that can be dragged to the drop target:</p>
- <div id="dragMe" draggable="true">Square</div>
- <hr/>
- </div>
- <div id="console"></div>
- <script>
- description("This test checks that effectAllowed and dropEffect cannot be set to values that aren't defined in the spec");
- var successfullyParsed = true;
- </script>
-</body>
-</html>
diff --git a/LayoutTests/fast/events/drag-and-drop-expected.txt b/LayoutTests/fast/events/drag-and-drop-expected.txt
index 7c2de07..6ed7061 100644
--- a/LayoutTests/fast/events/drag-and-drop-expected.txt
+++ b/LayoutTests/fast/events/drag-and-drop-expected.txt
@@ -92,15 +92,10 @@ PASS event.dataTransfer.dropEffect is "none"
When effectAllowed == "dummy"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.dropEffect is "copy"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.dropEffect is "move"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
-PASS event.dataTransfer.dropEffect is "link"
-PASS event.dataTransfer.effectAllowed is "uninitialized"
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "none"
PASS event.dataTransfer.dropEffect is "none"
TEST COMPLETE
diff --git a/LayoutTests/fast/events/drag-and-drop.html b/LayoutTests/fast/events/drag-and-drop.html
index 92cbcd3..842b607 100644
--- a/LayoutTests/fast/events/drag-and-drop.html
+++ b/LayoutTests/fast/events/drag-and-drop.html
@@ -99,16 +99,6 @@
chosenEffectAllowed = "uninitialized";
}
- if (chosenEffectAllowed === "dummy") {
- // If a bad effectAllowed is attempted to be set, it should never be set, and the
- // effectAllowed should be uninitialized.
- shouldBeEqualToString("event.dataTransfer.effectAllowed", "uninitialized");
-
- // Then set the chosenEffectAllowed so isDropEffectAllowed matches the HTML5 spec, and
- // doesn't need special cases for undefined.
- chosenEffectAllowed = "uninitialized";
- }
-
if (isDropEffectAllowed(chosenDropEffect, chosenEffectAllowed))
shouldBeEqualToString('event.dataTransfer.dropEffect', dropEffectElem.options[dropEffectElem.selectedIndex].value);
else
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4f30845..536adc0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -63,25 +63,6 @@
* bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp:
* bindings/v8/custom/V8XSLTProcessorCustom.cpp:
-2010-01-14 Brian Weinstein <bweinstein at apple.com>
-
- Reviewed by Oliver Hunt.
-
- [DnD] effectAllowed and dropEffect can be set to bogus values.
- Fixes <https://bugs.webkit.org/show_bug.cgi?id=33635>.
-
- Test to make aure dropEffect and effectAllowed are being set to valid values
- when they are being set (list of valid values given by HTML5 specification).
-
- Also, drive by change to initialize dropEffect to none (as described in spec).
-
- Test: fast/events/bogus-dropEffect-effectAllowed.html
-
- * dom/Clipboard.cpp:
- (WebCore::Clipboard::Clipboard): Initialize m_dropEffect to "none".
- (WebCore::Clipboard::setDropEffect): Check if dropEffect is being set to a valid value.
- (WebCore::Clipboard::setEffectAllowed): Check if effectAllowed is being set to a valid value.
-
2010-01-14 Martin Robinson <martin.james.robinson at gmail.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/dom/Clipboard.cpp b/WebCore/dom/Clipboard.cpp
index 2a0386f..b272f5d 100644
--- a/WebCore/dom/Clipboard.cpp
+++ b/WebCore/dom/Clipboard.cpp
@@ -35,8 +35,7 @@
namespace WebCore {
Clipboard::Clipboard(ClipboardAccessPolicy policy, bool isForDragging)
- : m_policy(policy)
- , m_dropEffect("none")
+ : m_policy(policy)
, m_effectAllowed("uninitialized")
, m_dragStarted(false)
, m_forDragging(isForDragging)
@@ -131,10 +130,6 @@ void Clipboard::setDropEffect(const String &effect)
if (!m_forDragging)
return;
- // The attribute must ignore any attempts to set it to a value other than none, copy, link, and move.
- if (effect != "none" && effect != "copy" && effect != "link" && effect != "move")
- return;
-
if (m_policy == ClipboardReadable || m_policy == ClipboardTypesReadable)
m_dropEffect = effect;
}
@@ -144,17 +139,6 @@ void Clipboard::setEffectAllowed(const String &effect)
if (!m_forDragging)
return;
- if (dragOpFromIEOp(effect) == DragOperationPrivate) {
- // This means that there was no conversion, and the effectAllowed that
- // we are passed isn't a valid effectAllowed, so we should ignore it,
- // and not set m_effectAllowed.
-
- // The attribute must ignore any attempts to set it to a value other than
- // none, copy, copyLink, copyMove, link, linkMove, move, all, and uninitialized.
- return;
- }
-
-
if (m_policy == ClipboardWritable)
m_effectAllowed = effect;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list