Fixed <rdar://problem/3759190> allow input methods the option of processing mouse...

Reviewed by Mark Rowe.

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

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 543be902e537fb404ebdd30749f76a75822f760e..5ca9b6f999acaad9448eff33ae966f6fb7a47ac7 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-23  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Mark Rowe.
+        
+        Fixed <rdar://problem/3759190> allow input methods the option of processing mouse events themselves
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView mouseDown:]):
+
 2007-11-22  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Antti Koivisto.

diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index 7e49e4300bfc8e2ec01c8307946696d50da3a8da..7708955cde565300ce4337947eeaa9c5a764b031 100644 (file)
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -3029,7 +3029,9 @@ static void _updateActiveStateTimerCallback(CFRunLoopTimerRef timer, void *info)
 
 - (void)mouseDown:(NSEvent *)event
 {
-    [self retain];
+    RetainPtr<WebHTMLView> protector = self;
+    if ([[self inputContext] wantsToHandleMouseEvents] && [[self inputContext] handleMouseEvent:event])
+        return;
 
     _private->handlingMouseDownEvent = YES;
 
@@ -3061,8 +3063,6 @@ done:
     _private->firstResponderTextViewAtMouseDownTime = nil;
 
     _private->handlingMouseDownEvent = NO;
-    
-    [self release];
 }
 
 - (void)dragImage:(NSImage *)dragImage