[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 d233e0b5a53619a5cbfaf74014cabffffdce8268
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 24 23:35:51 2002 +0000

    	New Java plug-in works! Much faster to load and no spinny cursor! Unfortunately, it very unstable.
    
            * Plugins.subproj/WebPluginController.m: cleaned-up the logging messages.
            (-[WebPluginController addPluginView:]):
            (-[WebPluginController didAddPluginView:]):
            (-[WebPluginController startAllPlugins]):
            (-[WebPluginController stopAllPlugins]):
            (-[WebPluginController destroyAllPlugins]):
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURL:]): make height and width an attribute.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9b522e9..a9ed24d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2002-10-24  Chris Blumenberg  <cblu at apple.com>
 
+	New Java plug-in works! Much faster to load and no spinny cursor! Unfortunately, it very unstable.
+
+        * Plugins.subproj/WebPluginController.m: cleaned-up the logging messages.
+        (-[WebPluginController addPluginView:]):
+        (-[WebPluginController didAddPluginView:]):
+        (-[WebPluginController startAllPlugins]):
+        (-[WebPluginController stopAllPlugins]):
+        (-[WebPluginController destroyAllPlugins]):
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURL:]): make height and width an attribute.
+
+2002-10-24  Chris Blumenberg  <cblu at apple.com>
+
 	Some clean-up and bug fixes for new plug-in support.
 
         * Plugins.subproj/WebPluginController.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9b522e9..a9ed24d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-10-24  Chris Blumenberg  <cblu at apple.com>
 
+	New Java plug-in works! Much faster to load and no spinny cursor! Unfortunately, it very unstable.
+
+        * Plugins.subproj/WebPluginController.m: cleaned-up the logging messages.
+        (-[WebPluginController addPluginView:]):
+        (-[WebPluginController didAddPluginView:]):
+        (-[WebPluginController startAllPlugins]):
+        (-[WebPluginController stopAllPlugins]):
+        (-[WebPluginController destroyAllPlugins]):
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURL:]): make height and width an attribute.
+
+2002-10-24  Chris Blumenberg  <cblu at apple.com>
+
 	Some clean-up and bug fixes for new plug-in support.
 
         * Plugins.subproj/WebPluginController.m:
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 9db06c2..fdc09e2 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -48,7 +48,7 @@
 
 - (void)addPluginView:(NSView <WebPlugin> *)view
 {
-    LOG(Plugins, "addPluginView: %s: pluginInitialize", [[view className] lossyCString]);
+    LOG(Plugins, "pluginInitialize: %s", [[view className] lossyCString]);
     
     [views addObject:view];
     [view pluginInitialize];
@@ -56,28 +56,28 @@
 
 - (void)didAddPluginView:(NSView <WebPlugin> *)view
 {
-    LOG(Plugins, "didAddPluginView: %s: pluginStart", [[view className] lossyCString]);
+    LOG(Plugins, "pluginStart: %s", [[view className] lossyCString]);
     
     [view pluginStart];
 }
 
 - (void)startAllPlugins
 {
-    LOG(Plugins, "startAllPlugins: pluginStart");
+    LOG(Plugins, "pluginStart");
     
     [views makeObjectsPerformSelector:@selector(pluginStart)];
 }
 
 - (void)stopAllPlugins
 {
-    LOG(Plugins, "stopAllPlugins: pluginStop");
+    LOG(Plugins, "pluginStop");
     
     [views makeObjectsPerformSelector:@selector(pluginStop)];
 }
 
 - (void)destroyAllPlugins
 {
-    LOG(Plugins, "destroyAllPlugins: pluginDestroy");
+    LOG(Plugins, "pluginDestroy");
     
     [self stopAllPlugins];
     [views makeObjectsPerformSelector:@selector(pluginDestroy)];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index dff40d3..986f6e6 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -14,6 +14,7 @@
 #import <WebKit/WebHistoryItem.h>
 #import <WebKit/WebHTMLRepresentationPrivate.h>
 #import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitStatisticsPrivate.h>
 #import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebNetscapePluginEmbeddedView.h>
@@ -429,12 +430,14 @@
                                       baseURL:(NSURL *)baseURL
 {
     WebPluginController *pluginController = [frame pluginController];
-
+    
     NSDictionary *arguments = [NSDictionary dictionaryWithObjectsAndKeys:
         baseURL, WebPluginBaseURLKey,
         attributes, WebPluginAttributesKey,
         pluginController, WebPluginContainerKey, nil];
 
+    LOG(Plugins, "arguments:\n%s", [[arguments description] lossyCString]);
+    
     NSView<WebPlugin> *view = [[pluginPackage viewFactory] pluginViewWithArguments:arguments];
     [pluginController addPluginView:view];
 
@@ -483,7 +486,7 @@
                                                                      URL:URL
                                                                  baseURL:baseURL
                                                                 MIMEType:MIMEType
-                                                               attributes:attributes] autorelease];
+                                                              attributes:attributes] autorelease];
         }else{
             [NSException raise:NSInternalInconsistencyException
                         format:@"Plugin package class not recognized"];
@@ -507,8 +510,13 @@
     }
 
     if([pluginPackage isKindOfClass:[WebPluginPackage class]]){
+        NSMutableDictionary *theAttributes = [NSMutableDictionary dictionary];
+        [theAttributes addEntriesFromDictionary:attributes];
+        [theAttributes setObject:[NSString stringWithFormat:@"%d", (int)theFrame.size.width] forKey:@"width"];
+        [theAttributes setObject:[NSString stringWithFormat:@"%d", (int)theFrame.size.height] forKey:@"height"];
+        
         return [self pluginViewWithPackage:(WebPluginPackage *)pluginPackage
-                                attributes:attributes
+                                attributes:theAttributes
                                    baseURL:baseURL];
     }
     else if([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]){

-- 
WebKit Debian packaging