[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 06:24:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e0add2d386a126da289932dc55376b606686dd4f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 11 20:08:48 2002 +0000
* Plugins.subproj/IFPluginNullEventSender.h:
* Plugins.subproj/IFPluginNullEventSender.m:
(-[IFPluginNullEventSender initWithPluginView:]): renamed, simplified
(-[IFPluginNullEventSender stop]): call plugin debug function
* Plugins.subproj/IFPluginView.h:
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView start]): call new initWithPluginView
(-[IFPluginView windowWillClose:]): added back to fix plugin view leak
(-[IFPluginView NPP_HandleEvent]): added
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1539 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94aec81..537ad4a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-11 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFPluginNullEventSender.h:
+ * Plugins.subproj/IFPluginNullEventSender.m:
+ (-[IFPluginNullEventSender initWithPluginView:]): renamed, simplified
+ (-[IFPluginNullEventSender stop]): call plugin debug function
+ * Plugins.subproj/IFPluginView.h:
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView start]): call new initWithPluginView
+ (-[IFPluginView windowWillClose:]): added back to fix plugin view leak
+ (-[IFPluginView NPP_HandleEvent]): added
+
2002-07-11 Darin Adler <darin at apple.com>
- fixed 2930872 -- option-arrow keys should page up and down
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 94aec81..537ad4a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-11 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFPluginNullEventSender.h:
+ * Plugins.subproj/IFPluginNullEventSender.m:
+ (-[IFPluginNullEventSender initWithPluginView:]): renamed, simplified
+ (-[IFPluginNullEventSender stop]): call plugin debug function
+ * Plugins.subproj/IFPluginView.h:
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView start]): call new initWithPluginView
+ (-[IFPluginView windowWillClose:]): added back to fix plugin view leak
+ (-[IFPluginView NPP_HandleEvent]): added
+
2002-07-11 Darin Adler <darin at apple.com>
- fixed 2930872 -- option-arrow keys should page up and down
diff --git a/WebKit/Plugins.subproj/IFPluginNullEventSender.h b/WebKit/Plugins.subproj/IFPluginNullEventSender.h
index 30e30b2..f05d602 100644
--- a/WebKit/Plugins.subproj/IFPluginNullEventSender.h
+++ b/WebKit/Plugins.subproj/IFPluginNullEventSender.h
@@ -6,6 +6,8 @@
#import <Foundation/Foundation.h>
#import <npapi.h>
+ at class IFPluginView;
+
@interface IFPluginNullEventSender : NSObject{
NPP instance;
NPP_HandleEventProcPtr NPP_HandleEvent;
@@ -13,7 +15,7 @@
NSWindow *window;
}
--(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)handleEventFunction window:(NSWindow *)theWindow;
+-(id)initWithPluginView:(IFPluginView *)pluginView;
-(void)sendNullEvents;
-(void)stop;
@end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/IFPluginNullEventSender.m b/WebKit/Plugins.subproj/IFPluginNullEventSender.m
index 016be20..e1cb516 100644
--- a/WebKit/Plugins.subproj/IFPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/IFPluginNullEventSender.m
@@ -10,14 +10,13 @@
@implementation IFPluginNullEventSender
--(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)handleEventFunction window:(NSWindow *)theWindow
+-(id)initWithPluginView:(IFPluginView *)pluginView
{
[super init];
- instance = pluginInstance;
- NPP_HandleEvent = handleEventFunction;
- shouldStop = FALSE;
- window = [theWindow retain];
+ instance = [pluginView pluginInstance];
+ NPP_HandleEvent = [pluginView NPP_HandleEvent];
+ window = [[pluginView window] retain];
return self;
}
@@ -52,7 +51,7 @@
-(void) stop
{
- WEBKITDEBUG("Stopping null events\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stopping null events\n");
shouldStop = TRUE;
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
}
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index 9c4f88d..51addf2 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -66,5 +66,6 @@
- (NPP_StreamAsFileProcPtr)NPP_StreamAsFile;
- (NPP_DestroyStreamProcPtr)NPP_DestroyStream;
- (NPP_URLNotifyProcPtr)NPP_URLNotify;
+- (NPP_HandleEventProcPtr) NPP_HandleEvent;
@end
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 66366e6..e708ebc 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -466,6 +466,8 @@ static char *newCString(NSString *string)
[notificationCenter addObserver:self selector:@selector(viewHasMoved:)
name:NSViewBoundsDidChangeNotification object:view];
}
+ [notificationCenter addObserver:self selector:@selector(windowWillClose:)
+ name:NSWindowWillCloseNotification object:theWindow];
[notificationCenter addObserver:self selector:@selector(windowBecameKey:)
name:NSWindowDidBecomeKeyNotification object:theWindow];
[notificationCenter addObserver:self selector:@selector(windowResignedKey:)
@@ -490,7 +492,7 @@ static char *newCString(NSString *string)
}
}
- eventSender = [[IFPluginNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent window:theWindow];
+ eventSender = [[IFPluginNullEventSender alloc] initWithPluginView:self];
[eventSender sendNullEvents];
[self resetTrackingRect];
}
@@ -650,6 +652,11 @@ static char *newCString(NSString *string)
[self resetTrackingRect];
}
+-(void) windowWillClose:(NSNotification *)notification
+{
+ [self stop];
+}
+
-(void) windowBecameKey:(NSNotification *)notification
{
[self sendActivateEvent:YES];
@@ -920,4 +927,8 @@ static char *newCString(NSString *string)
return NPP_URLNotify;
}
+- (NPP_HandleEventProcPtr) NPP_HandleEvent
+{
+ return NPP_HandleEvent;
+}
@end
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.h b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
index 30e30b2..f05d602 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.h
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
@@ -6,6 +6,8 @@
#import <Foundation/Foundation.h>
#import <npapi.h>
+ at class IFPluginView;
+
@interface IFPluginNullEventSender : NSObject{
NPP instance;
NPP_HandleEventProcPtr NPP_HandleEvent;
@@ -13,7 +15,7 @@
NSWindow *window;
}
--(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)handleEventFunction window:(NSWindow *)theWindow;
+-(id)initWithPluginView:(IFPluginView *)pluginView;
-(void)sendNullEvents;
-(void)stop;
@end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
index 016be20..e1cb516 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
@@ -10,14 +10,13 @@
@implementation IFPluginNullEventSender
--(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)handleEventFunction window:(NSWindow *)theWindow
+-(id)initWithPluginView:(IFPluginView *)pluginView
{
[super init];
- instance = pluginInstance;
- NPP_HandleEvent = handleEventFunction;
- shouldStop = FALSE;
- window = [theWindow retain];
+ instance = [pluginView pluginInstance];
+ NPP_HandleEvent = [pluginView NPP_HandleEvent];
+ window = [[pluginView window] retain];
return self;
}
@@ -52,7 +51,7 @@
-(void) stop
{
- WEBKITDEBUG("Stopping null events\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stopping null events\n");
shouldStop = TRUE;
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 9c4f88d..51addf2 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -66,5 +66,6 @@
- (NPP_StreamAsFileProcPtr)NPP_StreamAsFile;
- (NPP_DestroyStreamProcPtr)NPP_DestroyStream;
- (NPP_URLNotifyProcPtr)NPP_URLNotify;
+- (NPP_HandleEventProcPtr) NPP_HandleEvent;
@end
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 66366e6..e708ebc 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -466,6 +466,8 @@ static char *newCString(NSString *string)
[notificationCenter addObserver:self selector:@selector(viewHasMoved:)
name:NSViewBoundsDidChangeNotification object:view];
}
+ [notificationCenter addObserver:self selector:@selector(windowWillClose:)
+ name:NSWindowWillCloseNotification object:theWindow];
[notificationCenter addObserver:self selector:@selector(windowBecameKey:)
name:NSWindowDidBecomeKeyNotification object:theWindow];
[notificationCenter addObserver:self selector:@selector(windowResignedKey:)
@@ -490,7 +492,7 @@ static char *newCString(NSString *string)
}
}
- eventSender = [[IFPluginNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent window:theWindow];
+ eventSender = [[IFPluginNullEventSender alloc] initWithPluginView:self];
[eventSender sendNullEvents];
[self resetTrackingRect];
}
@@ -650,6 +652,11 @@ static char *newCString(NSString *string)
[self resetTrackingRect];
}
+-(void) windowWillClose:(NSNotification *)notification
+{
+ [self stop];
+}
+
-(void) windowBecameKey:(NSNotification *)notification
{
[self sendActivateEvent:YES];
@@ -920,4 +927,8 @@ static char *newCString(NSString *string)
return NPP_URLNotify;
}
+- (NPP_HandleEventProcPtr) NPP_HandleEvent
+{
+ return NPP_HandleEvent;
+}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list