[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 c09b3e021abc5bf427ef6943caff3bdb2e1df6b1
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 17:27:04 2002 +0000

    	Added WebPluginController which controls and reacts to plug-in requests. Its owned by the WebFrame.
    
            * Plugins.subproj/WebPluginController.h: Added.
            * Plugins.subproj/WebPluginController.m: Added.
            (-[WebPluginController initWithWebFrame:]):
            (-[WebPluginController showURL:inFrame:]):
            (-[WebPluginController showStatus:]):
            * WebView.subproj/WebFramePrivate.h:
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFramePrivate dealloc]):
            (-[WebFrame pluginController]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3ca3ad0..53c58f3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-10-23  Chris Blumenberg  <cblu at apple.com>
+
+	Added WebPluginController which controls and reacts to plug-in requests. Its owned by the WebFrame.
+
+        * Plugins.subproj/WebPluginController.h: Added.
+        * Plugins.subproj/WebPluginController.m: Added.
+        (-[WebPluginController initWithWebFrame:]):
+        (-[WebPluginController showURL:inFrame:]):
+        (-[WebPluginController showStatus:]):
+        * WebView.subproj/WebFramePrivate.h:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFramePrivate dealloc]):
+        (-[WebFrame pluginController]):
+
 2002-10-23  Darin Adler  <darin at apple.com>
 
 	Add WebFileButton, to be used by WebCore soon. It's about 1/2
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3ca3ad0..53c58f3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-23  Chris Blumenberg  <cblu at apple.com>
+
+	Added WebPluginController which controls and reacts to plug-in requests. Its owned by the WebFrame.
+
+        * Plugins.subproj/WebPluginController.h: Added.
+        * Plugins.subproj/WebPluginController.m: Added.
+        (-[WebPluginController initWithWebFrame:]):
+        (-[WebPluginController showURL:inFrame:]):
+        (-[WebPluginController showStatus:]):
+        * WebView.subproj/WebFramePrivate.h:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFramePrivate dealloc]):
+        (-[WebFrame pluginController]):
+
 2002-10-23  Darin Adler  <darin at apple.com>
 
 	Add WebFileButton, to be used by WebCore soon. It's about 1/2
diff --git a/WebKit/Plugins.subproj/WebPluginController.h b/WebKit/Plugins.subproj/WebPluginController.h
new file mode 100644
index 0000000..07c715d
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebPluginController.h
@@ -0,0 +1,22 @@
+//
+//  WebPluginController.h
+//  WebKit
+//
+//  Created by Chris Blumenberg on Wed Oct 23 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import <WebKit/WebPluginContainer.h>
+
+ at class WebFrame;
+
+ at interface WebPluginController : NSObject <WebPluginContainer>
+{
+    WebFrame *frame;
+}
+
+- initWithWebFrame:(WebFrame *)theFrame;
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
new file mode 100644
index 0000000..f13663e
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -0,0 +1,58 @@
+//
+//  WebPluginController.m
+//  WebKit
+//
+//  Created by Chris Blumenberg on Wed Oct 23 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <WebKit/WebController.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebPluginController.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
+
+#import <WebFoundation/WebResourceRequest.h>
+
+ at implementation WebPluginController
+
+- initWithWebFrame:(WebFrame *)theFrame
+{
+    // Not retained because the frame retains this plug-in controller.
+    frame = theFrame;
+
+    return self;
+}
+
+- (void)showURL:(NSURL *)URL inFrame:(NSString *)target
+{
+    if(!URL || !target){
+        return;
+    }
+
+    WebFrame *otherFrame = [frame frameNamed:target];
+    if(!otherFrame){
+        // FIXME: Open new window instead of return.
+        return;
+    }
+
+    WebDataSource *dataSource = [[WebDataSource alloc] initWithRequest:[WebResourceRequest requestWithURL:URL]];
+    if(!dataSource){
+        return;
+    }
+
+    if([otherFrame setProvisionalDataSource:dataSource]){
+        [otherFrame startLoading];
+    }
+}
+
+- (void)showStatus:(NSString *)message
+{
+    if(!message){
+        return;
+    }
+    
+    [[[frame controller] windowOperationsDelegate] setStatusText:message];
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index eabf826..c8ac1b5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -11,6 +11,7 @@
 @class WebBridge;
 @class WebFrameBridge;
 @class WebHistoryItem;
+ at class WebPluginController;
 @class WebView;
 
 typedef enum {
@@ -57,6 +58,7 @@ typedef enum {
     WebFrameLoadType loadType;
     WebFrame *parent;
     NSMutableArray *children;
+    WebPluginController *pluginController;
 }
 
 - (void)setName:(NSString *)name;
@@ -105,4 +107,6 @@ typedef enum {
 
 - (void)_addChild:(WebFrame *)child;
 
+- (WebPluginController *)pluginController;
+
 @end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9566104..7b8863d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -22,6 +22,7 @@
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebPluginController.h>
 #import <WebKit/WebPreferencesPrivate.h>
 #import <WebKit/WebViewPrivate.h>
 
@@ -68,6 +69,7 @@ static const char * const stateNames[] = {
     [dataSource release];
     [provisionalDataSource release];
     [children release];
+    [pluginController release];
     
     [super dealloc];
 }
@@ -802,4 +804,13 @@ static const char * const stateNames[] = {
     [[child dataSource] _setOverrideEncoding:[[self dataSource] _overrideEncoding]];   
 }
 
+- (WebPluginController *)pluginController
+{
+    if(!_private->pluginController){
+        _private->pluginController = [[WebPluginController alloc] initWithWebFrame:self];
+    }
+
+    return _private->pluginController;
+}
+
 @end

-- 
WebKit Debian packaging