[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:57:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3a429b442c0710ee60725e75b143c05fe6d19068
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 7 22:11:50 2002 +0000
Added a tracking rect to IFPluginView so that we can send cursor events
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@714 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 4c9ad93..3c2ac6a 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -166,6 +166,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
transferred = TRUE;
webView = [self findSuperview:@"IFWebView"];
webController = [webView controller];
+ trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
}
[self sendUpdateEvent];
}
@@ -461,22 +462,17 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
EventRecord event;
bool acceptedEvent;
- KWQDebug("NPP_HandleEvent(mouseEntered)\n");
- if([theEvent trackingNumber] != trackingTag)
- return;
event.what = adjustCursorEvent;
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseEntered): %dn", acceptedEvent);
+ KWQDebug("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
}
- (void)mouseExited:(NSEvent *)theEvent
{
EventRecord event;
bool acceptedEvent;
-
- if([theEvent trackingNumber] != trackingTag)
- return;
+
event.what = adjustCursorEvent;
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 4c9ad93..3c2ac6a 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -166,6 +166,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
transferred = TRUE;
webView = [self findSuperview:@"IFWebView"];
webController = [webView controller];
+ trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
}
[self sendUpdateEvent];
}
@@ -461,22 +462,17 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
EventRecord event;
bool acceptedEvent;
- KWQDebug("NPP_HandleEvent(mouseEntered)\n");
- if([theEvent trackingNumber] != trackingTag)
- return;
event.what = adjustCursorEvent;
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseEntered): %dn", acceptedEvent);
+ KWQDebug("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
}
- (void)mouseExited:(NSEvent *)theEvent
{
EventRecord event;
bool acceptedEvent;
-
- if([theEvent trackingNumber] != trackingTag)
- return;
+
event.what = adjustCursorEvent;
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list