[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

dglazkov at chromium.org dglazkov at chromium.org
Thu Apr 8 02:14:42 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 6462beced3617556a11e636b6a6747663901f41c
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 23:14:22 2010 +0000

    [Chromium] Reset multiple form submission protection on mouse events.
    https://bugs.webkit.org/show_bug.cgi?id=35128
    
    Reviewed by Darin Fisher.
    
    WebKit/chromium:
    
    * src/WebViewImpl.cpp:
    (WebKit::WebViewImpl::mouseDown):
    
    LayoutTests:
    
    * fast/forms/multiple-form-submission-protection-mouse-expected.txt: Copied from LayoutTests/editing/execCommand/copy-without-selection-expected.txt.
    * fast/forms/multiple-form-submission-protection-mouse.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55686 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 70369a7..aefef2c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-08  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Reset multiple form submission protection on mouse events.
+        https://bugs.webkit.org/show_bug.cgi?id=35128
+
+        * fast/forms/multiple-form-submission-protection-mouse-expected.txt: Copied from LayoutTests/editing/execCommand/copy-without-selection-expected.txt.
+        * fast/forms/multiple-form-submission-protection-mouse.html: Added.
+
 2010-03-08  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
 
         Reviewed by Xan Lopez.
diff --git a/LayoutTests/editing/execCommand/copy-without-selection-expected.txt b/LayoutTests/fast/forms/multiple-form-submission-protection-mouse-expected.txt
similarity index 100%
copy from LayoutTests/editing/execCommand/copy-without-selection-expected.txt
copy to LayoutTests/fast/forms/multiple-form-submission-protection-mouse-expected.txt
diff --git a/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html b/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html
new file mode 100644
index 0000000..4356dce
--- /dev/null
+++ b/LayoutTests/fast/forms/multiple-form-submission-protection-mouse.html
@@ -0,0 +1,51 @@
+<html>
+<head>
+<script>
+
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.setCanOpenWindows();
+    layoutTestController.waitUntilDone();
+}
+
+addEventListener('message', function(e) {
+    simulateClick('button2');
+}, false);
+
+function runTest()
+{
+    if (!eventSender)
+        return;
+
+    simulateClick('button1');
+}
+
+function simulateClick(id)
+{
+    var rect = document.getElementById(id).getBoundingClientRect();
+    eventSender.mouseMoveTo(rect.left + rect.width / 2, rect.top + rect.height / 2);
+    eventSender.mouseDown();
+    eventSender.mouseUp();
+}
+
+function submitTo(target)
+{
+    document.test.target = target;
+    document.test.submit();
+}
+
+</script>
+</head>
+<body onload="runTest()">
+<p>This test ensures that multiple form submission protection is correctly reset on mouse events. To test manually:
+<ol>
+<li>Click on "Click 1" to submit form to a new window. The window will close immediately.
+<li>Click on "Click 2" to submit form to this window. Single word "SUCCESS" should replace the contents of this document.
+</ol>
+<p>If either event doesn't occur, the test has failed.
+<form method="post" name="test" action="data:text/html,<script>if (opener) { opener.postMessage('trololo', '*'); window.close(); } else { document.write('SUCCESS'); window.layoutTestController && layoutTestController.notifyDone(); }</script>">
+<input type="button" id="button1" value="Click 1" onclick="submitTo('_new')">
+<input type="button" id="button2" value="Click 2" onclick="submitTo('_self')">
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index ebe7b9d..011ee8a 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5815,3 +5815,6 @@ http/tests/cookies/third-party-cookie-relaxing.html
 # Needs double click support in DRT
 # See https://bugs.webkit.org/show_bug.cgi?id=35862
 fast/events/zoom-dblclick.html
+
+# For some reason crashes when run with all tests. Passes individually.
+fast/forms/multiple-form-submission-protection-mouse.html
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index a781c5e..b1478a7 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -125,3 +125,6 @@ svg/custom/tiling-regular-hexagonal-crash.svg
 
 # Need to add functionality to DumpRenderTree to handle enable/disable Spatial Navigation
 fast/events/spatial-navigation
+
+# For some reason crashes when run with all tests. Passes individually.
+fast/forms/multiple-form-submission-protection-mouse.html
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 27e7069..f04ebdb 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5101,3 +5101,6 @@ storage/open-database-creation-callback-isolated-world.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=35824 - Doesn't apply to platforms that don't enforce the CFNetwork-style 3rd party cookie policy
 http/tests/cookies/third-party-cookie-relaxing.html
+
+# For some reason crashes when run with all tests. Passes individually.
+fast/forms/multiple-form-submission-protection-mouse.html
\ No newline at end of file
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 90f9f70..ab6ea6e 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -784,3 +784,6 @@ fast/events/spatial-navigation
 
 # <rdar://problem/7718442> Implement 'preload=none'
 media/video-preload.html
+
+# For some reason crashes when run with all tests. Passes individually.
+fast/forms/multiple-form-submission-protection-mouse.html
\ No newline at end of file
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 491bf6c..3c651ba 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-08  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Reset multiple form submission protection on mouse events.
+        https://bugs.webkit.org/show_bug.cgi?id=35128
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::mouseDown):
+
 2010-03-08  Michael Nordman  <michaeln at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 6345cd1..e70c572 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -347,6 +347,8 @@ void WebViewImpl::mouseDown(const WebMouseEvent& event)
         }
     }
 
+    mainFrameImpl()->frame()->loader()->resetMultipleFormSubmissionProtection();
+
     mainFrameImpl()->frame()->eventHandler()->handleMousePressEvent(
         PlatformMouseEventBuilder(mainFrameImpl()->frameView(), event));
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list