[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:55:22 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 22d85f234e83a65a582723eebf13ab898ce48656
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 8 01:26:54 2002 +0000
Fixed HIToolbox include problem. Ricard added a call to stop in IFWebViewPrivate
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@602 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index 94888f7..597ec2b 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -38,7 +38,7 @@ typedef NPStream* NPS;
int32 streamOffset;
uint16 transferMode;
char **cAttributes, **cValues;
- bool isFlipped, transferred, hidden;
+ bool isFlipped, transferred, hidden, stopped;
NSString *url, *mime, *filename;
NSTrackingRectTag trackingTag;
@@ -75,6 +75,7 @@ typedef NPStream* NPS;
-(void)mouseExited:(NSEvent *)theEvent;
-(void)keyDown:(NSEvent *)theEvent;
-(void)keyUp:(NSEvent *)theEvent;
+-(void)stop;
-(void)dealloc;
// plug-in to browser calls
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index d01e80f..f588088 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -95,8 +95,9 @@
hidden = FALSE;
}
transferred = FALSE;
+ stopped = FALSE;
trackingTag = [self addTrackingRect:r owner:self userData:nil assumeInside:NO];
- eventSender = [[[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent] autorelease];
+ eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
[eventSender sendNullEvents];
return self;
}
@@ -471,6 +472,24 @@
KWQDebug("invalidateRegion\n");
}
+- (void)stop
+{
+ NPError npErr;
+ NSFileManager *fileManager;
+
+ if (!stopped){
+ [eventSender stop];
+ [eventSender release];
+ npErr = NPP_Destroy(instance, NULL);
+ KWQDebug("NPP_Destroy: %d\n", npErr);
+ if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY){
+ fileManager = [NSFileManager defaultManager];
+ [fileManager removeFileAtPath:filename handler:nil];
+ }
+ stopped = TRUE;
+ }
+}
+
-(void)forceRedraw
{
KWQDebug("forceRedraw\n");
@@ -478,14 +497,7 @@
-(void)dealloc
{
- NPError npErr;
- NSFileManager *fileManager;
-
- [eventSender stop];
- npErr = NPP_Destroy(instance, NULL);
- KWQDebug("NPP_Destroy: %d\n", npErr);
- fileManager = [NSFileManager defaultManager];
- [fileManager removeFileAtPath:filename handler:nil];
+ [self stop];
[super dealloc];
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 94888f7..597ec2b 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -38,7 +38,7 @@ typedef NPStream* NPS;
int32 streamOffset;
uint16 transferMode;
char **cAttributes, **cValues;
- bool isFlipped, transferred, hidden;
+ bool isFlipped, transferred, hidden, stopped;
NSString *url, *mime, *filename;
NSTrackingRectTag trackingTag;
@@ -75,6 +75,7 @@ typedef NPStream* NPS;
-(void)mouseExited:(NSEvent *)theEvent;
-(void)keyDown:(NSEvent *)theEvent;
-(void)keyUp:(NSEvent *)theEvent;
+-(void)stop;
-(void)dealloc;
// plug-in to browser calls
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index d01e80f..f588088 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -95,8 +95,9 @@
hidden = FALSE;
}
transferred = FALSE;
+ stopped = FALSE;
trackingTag = [self addTrackingRect:r owner:self userData:nil assumeInside:NO];
- eventSender = [[[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent] autorelease];
+ eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
[eventSender sendNullEvents];
return self;
}
@@ -471,6 +472,24 @@
KWQDebug("invalidateRegion\n");
}
+- (void)stop
+{
+ NPError npErr;
+ NSFileManager *fileManager;
+
+ if (!stopped){
+ [eventSender stop];
+ [eventSender release];
+ npErr = NPP_Destroy(instance, NULL);
+ KWQDebug("NPP_Destroy: %d\n", npErr);
+ if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY){
+ fileManager = [NSFileManager defaultManager];
+ [fileManager removeFileAtPath:filename handler:nil];
+ }
+ stopped = TRUE;
+ }
+}
+
-(void)forceRedraw
{
KWQDebug("forceRedraw\n");
@@ -478,14 +497,7 @@
-(void)dealloc
{
- NPError npErr;
- NSFileManager *fileManager;
-
- [eventSender stop];
- npErr = NPP_Destroy(instance, NULL);
- KWQDebug("NPP_Destroy: %d\n", npErr);
- fileManager = [NSFileManager defaultManager];
- [fileManager removeFileAtPath:filename handler:nil];
+ [self stop];
[super dealloc];
}
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 5c29dc3..f54cc18 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -123,7 +123,7 @@
HEADER_SEARCH_PATHS = ../WebCore/include;
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I.. -I../WebCore/src/kdelibs/khtml -I../WebCore/src/kwq -I../WebCore/src/kwq/kparts -I../WebCore/include -I../WebCore/include/private -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/";
+ OTHER_CFLAGS = "-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I.. -I../WebCore/src/kdelibs/khtml -I../WebCore/src/kwq -I../WebCore/src/kwq/kparts -I../WebCore/include -I../WebCore/include/private -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/ -F/System/Library/Frameworks/Carbon.framework/Frameworks/";
OTHER_LDFLAGS = "-lwebcore -framework WebFoundation";
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 048fd4d..47ae13a 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -6,6 +6,7 @@
NSWebPageView.
*/
#import <IFWebViewPrivate.h>
+#import <IFPluginView.h>
// Includes from KDE
#include <khtmlview.h>
@@ -49,7 +50,12 @@
count = [views count];
while (count--){
//WebKitDebugAtLevel(0x200, "Removing %p %s\n", [views objectAtIndex: 0], DEBUG_OBJECT([[[views objectAtIndex: 0] class] className]));
- [[views objectAtIndex: count] removeFromSuperviewWithoutNeedingDisplay];
+ id view;
+
+ view = [views objectAtIndex: count];
+ if ([view isKindOfClass: NSClassFromString (@"IFPluginView")])
+ [(IFPluginView *)view stop];
+ [view removeFromSuperviewWithoutNeedingDisplay];
}
[self setFrameSize: NSMakeSize (0,0)];
}
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 048fd4d..47ae13a 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -6,6 +6,7 @@
NSWebPageView.
*/
#import <IFWebViewPrivate.h>
+#import <IFPluginView.h>
// Includes from KDE
#include <khtmlview.h>
@@ -49,7 +50,12 @@
count = [views count];
while (count--){
//WebKitDebugAtLevel(0x200, "Removing %p %s\n", [views objectAtIndex: 0], DEBUG_OBJECT([[[views objectAtIndex: 0] class] className]));
- [[views objectAtIndex: count] removeFromSuperviewWithoutNeedingDisplay];
+ id view;
+
+ view = [views objectAtIndex: count];
+ if ([view isKindOfClass: NSClassFromString (@"IFPluginView")])
+ [(IFPluginView *)view stop];
+ [view removeFromSuperviewWithoutNeedingDisplay];
}
[self setFrameSize: NSMakeSize (0,0)];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list