git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a3c045)
LayoutTests:
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Jul 2006 08:41:52 +0000 (08:41 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Jul 2006 08:41:52 +0000 (08:41 +0000)
        Reviewed by Darin.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10167
        Bug 10167: REGRESSION(r15688): ASSERTION FAILED: _private->mouseDownEvent != nil in layout tests

        * fast/events/objc-event-api-expected.txt: Update test results.

WebKitTools:

        Reviewed by Darin.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10167
        Bug 10167: REGRESSION(r15688): ASSERTION FAILED: _private->mouseDownEvent != nil in layout tests

        * DumpRenderTree/EventSendingController.m: Don't set the mouse down flag
        in keyDown handler.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/events/objc-event-api-expected.txt patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/DumpRenderTree/EventSendingController.m patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a9292a3893d57dfef1e4810aecb1152116b4c19a..7b8c8dd4a4117d5576e00df156a7a66be20b1c1f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-31  Mark Rowe  <opendarwin.org@bdash.net.nz>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10167
+        Bug 10167: REGRESSION(r15688): ASSERTION FAILED: _private->mouseDownEvent != nil in layout tests
+
+        * fast/events/objc-event-api-expected.txt: Update test results.
+
 2006-07-31  Darin Adler  <darin@apple.com>
 
         * editing/pasteboard/paste-table-002-expected.txt: Corrected one result
diff --git a/LayoutTests/fast/events/objc-event-api-expected.txt b/LayoutTests/fast/events/objc-event-api-expected.txt
index a55c34f258605d6417a2b6f4b37edd1215da50bd..f86edc9d330d9c32897da2319a434f49f172728d 100644 (file)
--- a/LayoutTests/fast/events/objc-event-api-expected.txt
+++ b/LayoutTests/fast/events/objc-event-api-expected.txt
@@ -266,6 +266,19 @@ event type:      mouseup
   clientX:       1
   clientY:       1
   modifier keys: c:0 s:0 a:0 m:0
+event type:      mouseout
+  target:        <html>
+  eventPhase:    3
+  bubbles:       1
+  cancelable:    1
+  detail:        0
+  view:          OK (document: OK)
+  button:        0
+  screenX:       0
+  screenY:       0 (flipped)
+  clientX:       -1
+  clientY:       601
+  modifier keys: c:0 s:0 a:0 m:0
 Test
 This tests that DOMEvents are correctly handed to the ObjC API. See bug 9181.
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b2f83551589126b2909be3d61cdf68e7d1384185..37b799b65e87ecce2e6d5a3c441eb976307f970d 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-31  Mark Rowe  <opendarwin.org@bdash.net.nz>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10167
+        Bug 10167: REGRESSION(r15688): ASSERTION FAILED: _private->mouseDownEvent != nil in layout tests
+
+        * DumpRenderTree/EventSendingController.m: Don't set the mouse down flag
+        in keyDown handler.
+
 2006-07-30  Mark Rowe  <opendarwin.org@bdash.net.nz>
 
         Reviewed by Maciej.
diff --git a/WebKitTools/DumpRenderTree/EventSendingController.m b/WebKitTools/DumpRenderTree/EventSendingController.m
index eb2fcca843771055635f6cebc7db81f70e41dfad..6ee9d713fe6f332bcb1b6bf0804c41734a0f8f18 100644 (file)
--- a/WebKitTools/DumpRenderTree/EventSendingController.m
+++ b/WebKitTools/DumpRenderTree/EventSendingController.m
@@ -292,10 +292,8 @@ NSArray *webkitDomEventProperties;
     
 
     NSView *subView = [[frame webView] hitTest:[event locationInWindow]];
-    if (subView) {
+    if (subView)
         [subView keyDown:event];
-        down = YES;
-    }
 }
 
 - (void)enableDOMUIEventLogging:(WebScriptObject *)node
Mirror of the WebKit open source project from svn.webkit.org.