[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:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bf6a6308da11fbe1d6a47e08c15ea5647926c166
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 14 01:39:29 2002 +0000
- Added support for the OpenURL AppleScript command
- Added stubs for ShowFile and OpenBookmark AppleScript commands
- Added a stub for "start" in IFPluginView
- Made IFPluginView observe NSWindowWillCloseNotification
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@734 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index d05d619..b91336a 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -68,8 +68,9 @@ typedef struct _StreamData{
- initWithFrame:(NSRect) r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
-(void)drawRect:(NSRect)rect;
-(void)setWindow;
--(void)viewHasMoved:(NSNotification *)note;
+-(void)viewHasMoved:(NSNotification *)notification;
-(NSView *)findSuperview:(NSString *) viewName;
+- (void) windowWillClose:(NSNotification *)notification;
-(void)newStream:(NSString *)streamURL mimeType:(NSString *)mimeType notifyData:(void *)notifyData;
-(BOOL)acceptsFirstResponder;
-(BOOL)becomeFirstResponder;
@@ -83,6 +84,7 @@ typedef struct _StreamData{
-(void)keyDown:(NSEvent *)theEvent;
-(void)keyUp:(NSEvent *)theEvent;
-(void)stop;
+-(void)start;
-(void)dealloc;
// plug-in to browser calls
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 3c2ac6a..c19c66d 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -158,6 +158,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
notificationCenter = [NSNotificationCenter defaultCenter];
[notificationCenter addObserver:self selector:@selector(viewHasMoved:) name:@"NSViewBoundsDidChangeNotification" object:[self findSuperview:@"NSClipView"]];
[notificationCenter addObserver:self selector:@selector(viewHasMoved:) name:@"NSWindowDidResizeNotification" object:[self window]];
+ [notificationCenter addObserver:self selector:@selector(windowWillClose:) name:@"NSWindowWillCloseNotification" object:[self window]];
[self sendActivateEvent];
if(URL)
[self newStream:URL mimeType:mime notifyData:NULL];
@@ -176,7 +177,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
return YES;
}
--(void) viewHasMoved:(NSNotification *)note
+-(void) viewHasMoved:(NSNotification *)notification
{
[self setWindow];
[self sendUpdateEvent];
@@ -233,6 +234,11 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
return nil;
}
+- (void) windowWillClose:(NSNotification *)notification
+{
+ [self stop];
+}
+
- (void) newStream:(NSString *)streamURL mimeType:(NSString *)mimeType notifyData:(void *)notifyData
{
@@ -600,6 +606,11 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
KWQDebug("NPN_InvalidateRegion\n");
}
+-(void)start
+{
+
+}
+
- (void)stop
{
NPError npErr;
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index d05d619..b91336a 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -68,8 +68,9 @@ typedef struct _StreamData{
- initWithFrame:(NSRect) r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
-(void)drawRect:(NSRect)rect;
-(void)setWindow;
--(void)viewHasMoved:(NSNotification *)note;
+-(void)viewHasMoved:(NSNotification *)notification;
-(NSView *)findSuperview:(NSString *) viewName;
+- (void) windowWillClose:(NSNotification *)notification;
-(void)newStream:(NSString *)streamURL mimeType:(NSString *)mimeType notifyData:(void *)notifyData;
-(BOOL)acceptsFirstResponder;
-(BOOL)becomeFirstResponder;
@@ -83,6 +84,7 @@ typedef struct _StreamData{
-(void)keyDown:(NSEvent *)theEvent;
-(void)keyUp:(NSEvent *)theEvent;
-(void)stop;
+-(void)start;
-(void)dealloc;
// plug-in to browser calls
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 3c2ac6a..c19c66d 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -158,6 +158,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
notificationCenter = [NSNotificationCenter defaultCenter];
[notificationCenter addObserver:self selector:@selector(viewHasMoved:) name:@"NSViewBoundsDidChangeNotification" object:[self findSuperview:@"NSClipView"]];
[notificationCenter addObserver:self selector:@selector(viewHasMoved:) name:@"NSWindowDidResizeNotification" object:[self window]];
+ [notificationCenter addObserver:self selector:@selector(windowWillClose:) name:@"NSWindowWillCloseNotification" object:[self window]];
[self sendActivateEvent];
if(URL)
[self newStream:URL mimeType:mime notifyData:NULL];
@@ -176,7 +177,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
return YES;
}
--(void) viewHasMoved:(NSNotification *)note
+-(void) viewHasMoved:(NSNotification *)notification
{
[self setWindow];
[self sendUpdateEvent];
@@ -233,6 +234,11 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
return nil;
}
+- (void) windowWillClose:(NSNotification *)notification
+{
+ [self stop];
+}
+
- (void) newStream:(NSString *)streamURL mimeType:(NSString *)mimeType notifyData:(void *)notifyData
{
@@ -600,6 +606,11 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
KWQDebug("NPN_InvalidateRegion\n");
}
+-(void)start
+{
+
+}
+
- (void)stop
{
NPError npErr;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list