[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 14:56:18 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit c4c36f09d3885f8b8cf68366e30ab8d200074e3e
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 19:17:16 2010 +0000

    2010-10-25  Cris Neckar  <cdn at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Added check to ensure that events with the type "mousedown" are mouse events before dispatching.
            https://bugs.webkit.org/show_bug.cgi?id=48159
    
            Test: fast/events/keyboardevent-mousedown-crash.html
    
            * dom/Node.cpp:
            (WebCore::Node::defaultEventHandler):
    2010-10-25  Cris Neckar  <cdn at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Tests for a crash when an event with the type "mousedown" is not a MouseEvent.
            https://bugs.webkit.org/show_bug.cgi?id=48159
    
            * fast/events/keyboardevent-mousedown-crash-expected.txt: Added.
            * fast/events/keyboardevent-mousedown-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70473 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d23a945..04221b0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-25  Cris Neckar  <cdn at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Tests for a crash when an event with the type "mousedown" is not a MouseEvent.
+        https://bugs.webkit.org/show_bug.cgi?id=48159
+
+        * fast/events/keyboardevent-mousedown-crash-expected.txt: Added.
+        * fast/events/keyboardevent-mousedown-crash.html: Added.
+
 2010-10-25  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Add a flaky test to expectations.
diff --git a/LayoutTests/compositing/overflow/get-transform-from-non-box-container-expected.txt b/LayoutTests/fast/events/keyboardevent-mousedown-crash-expected.txt
similarity index 100%
copy from LayoutTests/compositing/overflow/get-transform-from-non-box-container-expected.txt
copy to LayoutTests/fast/events/keyboardevent-mousedown-crash-expected.txt
diff --git a/LayoutTests/fast/events/keyboardevent-mousedown-crash.html b/LayoutTests/fast/events/keyboardevent-mousedown-crash.html
new file mode 100644
index 0000000..38b1788
--- /dev/null
+++ b/LayoutTests/fast/events/keyboardevent-mousedown-crash.html
@@ -0,0 +1,21 @@
+<html>
+    <body>
+        <div id="test"></div>
+        <div id="result"></div> 
+        <script>
+            if (window.layoutTestController)
+            {
+                layoutTestController.dumpAsText();
+                layoutTestController.waitUntilDone();
+            }
+
+            var event = document.createEvent('KeyboardEvent');
+            event.initEvent('mousedown', true, true);
+            document.getElementById('test').dispatchEvent(event);
+
+            document.getElementById('result').innerHTML = "PASS";
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
+        </script> 
+    </body> 
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 86bd19c..1c85363 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-25  Cris Neckar  <cdn at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Added check to ensure that events with the type "mousedown" are mouse events before dispatching.
+        https://bugs.webkit.org/show_bug.cgi?id=48159
+
+        Test: fast/events/keyboardevent-mousedown-crash.html
+
+        * dom/Node.cpp:
+        (WebCore::Node::defaultEventHandler):
+
 2010-10-25  Kwang Yul Seo  <skyul at company100.net>
 
         Unreviewed build fix for r70400.
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index 0907820..251cb0f 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -2918,7 +2918,7 @@ void Node::defaultEventHandler(Event* event)
             if (Frame* frame = document()->frame())
                 frame->eventHandler()->defaultTextInputEventHandler(static_cast<TextEvent*>(event));
 #if ENABLE(PAN_SCROLLING)
-    } else if (eventType == eventNames().mousedownEvent) {
+    } else if (eventType == eventNames().mousedownEvent && event->isMouseEvent()) {
         MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
         if (mouseEvent->button() == MiddleButton) {
             if (enclosingLinkEventParentOrSelf())

-- 
WebKit Debian packaging

