[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 5d4f26e548cef84665fdf46ee2408fe452384f2e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 24 18:35:14 2002 +0000

    WebKit:
    
    	Changed some method names in WebPluginController.
    
            * Plugins.subproj/WebPluginController.h:
            * Plugins.subproj/WebPluginController.m:
            (-[WebPluginController didAddPluginView:]):
            (-[WebPluginController startAllPlugins]):
            (-[WebPluginController stopAllPlugins]):
            (-[WebPluginController destroyAllPlugins]):
            (-[WebPluginController windowWillClose:]):
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted]):
            (-[WebFrame _didAddSubview:]):
    
    WebBrowser:
    
    	Fixed: 2961256 - vend an open URL service
    
            * AppController.m:
            (-[AppController applicationDidFinishLaunching:]): register the services
            * ServicesProvider.h: Added.
            * ServicesProvider.m: Added.
            (-[ServicesProvider openURL:userData:error:]): the service
            * WebBrowser.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2453 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 667d435..fbc4cbe 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-10-24  Chris Blumenberg  <cblu at apple.com>
+
+	Changed some method names in WebPluginController.
+
+        * Plugins.subproj/WebPluginController.h:
+        * Plugins.subproj/WebPluginController.m:
+        (-[WebPluginController didAddPluginView:]):
+        (-[WebPluginController startAllPlugins]):
+        (-[WebPluginController stopAllPlugins]):
+        (-[WebPluginController destroyAllPlugins]):
+        (-[WebPluginController windowWillClose:]):
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):
+        (-[WebFrame _didAddSubview:]):
+
 === Alexander-29 ===
 
 2002-10-24  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 667d435..fbc4cbe 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-10-24  Chris Blumenberg  <cblu at apple.com>
+
+	Changed some method names in WebPluginController.
+
+        * Plugins.subproj/WebPluginController.h:
+        * Plugins.subproj/WebPluginController.m:
+        (-[WebPluginController didAddPluginView:]):
+        (-[WebPluginController startAllPlugins]):
+        (-[WebPluginController stopAllPlugins]):
+        (-[WebPluginController destroyAllPlugins]):
+        (-[WebPluginController windowWillClose:]):
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):
+        (-[WebFrame _didAddSubview:]):
+
 === Alexander-29 ===
 
 2002-10-24  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/Plugins.subproj/WebPluginController.h b/WebKit/Plugins.subproj/WebPluginController.h
index ae3db5c..f636638 100644
--- a/WebKit/Plugins.subproj/WebPluginController.h
+++ b/WebKit/Plugins.subproj/WebPluginController.h
@@ -23,7 +23,7 @@
 
 - initWithWebFrame:(WebFrame *)theFrame;
 - (void)addPluginView:(NSView <WebPlugin> *)view;
-- (void)didAddSubview:(NSView <WebPlugin> *)view;
-- (void)stopAllPlugins;
+- (void)didAddPluginView:(NSView <WebPlugin> *)view;
+- (void)destroyAllPlugins;
 
 @end
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 16de0fa..50b3371 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -51,14 +51,24 @@
     [view pluginInitialize];
 }
 
-- (void)didAddSubview:(NSView <WebPlugin> *)view
+- (void)didAddPluginView:(NSView <WebPlugin> *)view
 {
     [view pluginStart];
 }
 
+- (void)startAllPlugins
+{
+    [views makeObjectsPerformSelector:@selector(pluginStart)];
+}
+
 - (void)stopAllPlugins
 {
     [views makeObjectsPerformSelector:@selector(pluginStop)];
+}
+
+- (void)destroyAllPlugins
+{
+    [self stopAllPlugins];
     [views makeObjectsPerformSelector:@selector(pluginDestroy)];
     [views removeAllObjects];
 }
@@ -66,7 +76,7 @@
 - (void)windowWillClose:(NSNotification *)notification
 {
     if([notification object] == [[frame webView] window]){
-        [self stopAllPlugins];
+        [self destroyAllPlugins];
     }
 }
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 6a89011..a62f13b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -287,8 +287,8 @@ static const char * const stateNames[] = {
     
     documentView = [[self webView] documentView];
 
-    // Stop plug-ins before blowing away the view.
-    [_private->pluginController stopAllPlugins];
+    // Destroy plug-ins before blowing away the view.
+    [_private->pluginController destroyAllPlugins];
         
     switch ([self _state]) {
     	case WebFrameStateProvisional:
@@ -819,7 +819,7 @@ static const char * const stateNames[] = {
 - (void)_didAddSubview:(NSView *)view
 {
     if([view conformsToProtocol:@protocol(WebPlugin)]){
-        [_private->pluginController didAddSubview:view];
+        [_private->pluginController didAddPluginView:view];
     }
 }
 

-- 
WebKit Debian packaging