[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mhay
mhay at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:56:55 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ea0b08e764a4d7b75890a8ec38ce5d7cc68a60b0
Author: mhay <mhay at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 4 16:24:44 2002 +0000
(1) Modified destroyAllPlugins to remove the plugin's view from the browser's view hierarchy prior to calling the plugins' pluginDestroy methods.
(2) Modified showURL:inFrame: such that arg 'target' may be 'nil'.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2548 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 5a316bb..e16f954 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -80,6 +80,7 @@
LOG(Plugins, "pluginDestroy");
[self stopAllPlugins];
+ [views makeObjectsPerformSelector:@selector(removeFromSuperviewWithoutNeedingDisplay)];
[views makeObjectsPerformSelector:@selector(pluginDestroy)];
[views removeAllObjects];
}
@@ -93,7 +94,7 @@
- (void)showURL:(NSURL *)URL inFrame:(NSString *)target
{
- if(!URL || !target){
+ if ( !URL ){
return;
}
@@ -114,7 +115,7 @@
if(!message){
return;
}
-
+
[[[frame controller] windowOperationsDelegate] setStatusText:message];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list