[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

jnd at chromium.org jnd at chromium.org
Mon Feb 21 00:35:09 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 6e463961cef6d16052a930bcf658c743e5b54609
Author: jnd at chromium.org <jnd at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 23:52:27 2011 +0000

    2011-02-01  Johnny Ding  <jnd at chromium.org>
    
            Reviewed by Darin Adler.
    
            Don't set user gesture in HTMLAnchorElement's click handler because the click handler can be triggered by untrusted event.
            https://bugs.webkit.org/show_bug.cgi?id=53424
    
            * fast/events/popup-blocked-from-untrusted-click-event-on-anchor-expected.txt: Added.
            * fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html: Added.
    2011-02-01  Johnny Ding  <jnd at chromium.org>
    
            Reviewed by Darin Adler.
    
            Don't set user gesture in HTMLAnchorElement's click handler because the click handler can be triggered by untrusted event.
            https://bugs.webkit.org/show_bug.cgi?id=53424
    
            Test: fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
    
            * html/HTMLAnchorElement.cpp:
            (WebCore::handleLinkClick):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7efd0b2..3e839ce 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01  Johnny Ding  <jnd at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Don't set user gesture in HTMLAnchorElement's click handler because the click handler can be triggered by untrusted event.
+        https://bugs.webkit.org/show_bug.cgi?id=53424
+
+        * fast/events/popup-blocked-from-untrusted-click-event-on-anchor-expected.txt: Added.
+        * fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html: Added.
+
 2011-02-01  Zhenyao Mo  <zmo at google.com>
 
         Unreviewed, test expectations update.
diff --git a/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor-expected.txt b/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor-expected.txt
new file mode 100644
index 0000000..bf66177
--- /dev/null
+++ b/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor-expected.txt
@@ -0,0 +1,3 @@
+test
+PASS win is undefined.
+
diff --git a/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html b/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
new file mode 100644
index 0000000..32026d2
--- /dev/null
+++ b/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
@@ -0,0 +1,32 @@
+<html> 
+    <head>
+        <link rel="stylesheet" href="../js/resources/js-test-style.css">
+        <script src="../js/resources/js-test-pre.js"></script>
+    </head>
+    <body>
+        <a id=test href="javascript:popup()">test</a>
+        <div id="console"></div>
+        <script> 
+            var win;
+            function popup() {
+                win = window.open('about:blank','blank','height=200,width=200');
+                shouldBeUndefined("win");
+            }
+
+            if (window.layoutTestController) {
+                layoutTestController.dumpAsText();
+                layoutTestController.setCanOpenWindows();
+                layoutTestController.setPopupBlockingEnabled(true);
+                layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+                layoutTestController.waitUntilDone();
+            }
+
+            clickEvent = document.createEvent("MouseEvents");
+            clickEvent.initEvent("click", true, true, document.defaultView, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+            document.getElementById("test").dispatchEvent(clickEvent);
+
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
+        </script> 
+    </body> 
+</html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 264e13c..7b7ac7d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Johnny Ding  <jnd at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Don't set user gesture in HTMLAnchorElement's click handler because the click handler can be triggered by untrusted event.
+        https://bugs.webkit.org/show_bug.cgi?id=53424
+
+        Test: fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
+
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::handleLinkClick):
+
 2011-02-01  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed Qt buildfix after r77286.
diff --git a/Source/WebCore/html/HTMLAnchorElement.cpp b/Source/WebCore/html/HTMLAnchorElement.cpp
index deeade4..0c10022 100644
--- a/Source/WebCore/html/HTMLAnchorElement.cpp
+++ b/Source/WebCore/html/HTMLAnchorElement.cpp
@@ -551,8 +551,6 @@ void handleLinkClick(Event* event, Document* document, const String& url, const
     Frame* frame = document->frame();
     if (!frame)
         return;
-    // FIXME: This seems wrong.  Why are we manufactuing a user gesture?
-    UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
     frame->loader()->urlSelected(document->completeURL(url), target, event, false, false, hideReferrer ? NoReferrer : SendReferrer);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list