[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 d6c1ec729d111c2cb0f50946a9b9b77cd33b5d44
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 14 17:20:25 2002 +0000

    	Made WebNetscapePluginStream retain a WebNetscapePluginEmbeddedView not a WebBaseNetscapePluginView.
    
            * Plugins.subproj/WebNetscapePluginStream.h:
            * Plugins.subproj/WebNetscapePluginStream.m:
            (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3d0edb6..0cff080 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-14  Chris Blumenberg  <cblu at apple.com>
+
+	Made WebNetscapePluginStream retain a WebNetscapePluginEmbeddedView not a WebBaseNetscapePluginView.
+
+        * Plugins.subproj/WebNetscapePluginStream.h:
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+
 2002-10-13  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Added strings from WebBookmarkProxy.m.
@@ -7,9 +15,9 @@
 	- Eliminated the dual-role behavior of WebPluginStream.
 
 	Renamed WebPluginStream to WebBaseNetscapePluginStream.
-	WebNetscapePluginRepresentation, a subclass of WebNetscapePluginRepresentation,
+	WebNetscapePluginRepresentation, a subclass of WebBaseNetscapePluginStream,
 	is the document representation for standalone plug-ins.
-	WebNetscapePluginStream, also a subclass of WebNetscapePluginRepresentation,
+	WebNetscapePluginStream, also a subclass of WebBaseNetscapePluginStream,
 	is the general plug-in stream loader for embedded plug-ins or plug-in requested streams.
 
 	23 plug-in source files with more likely to come!
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3d0edb6..0cff080 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-10-14  Chris Blumenberg  <cblu at apple.com>
+
+	Made WebNetscapePluginStream retain a WebNetscapePluginEmbeddedView not a WebBaseNetscapePluginView.
+
+        * Plugins.subproj/WebNetscapePluginStream.h:
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+
 2002-10-13  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Added strings from WebBookmarkProxy.m.
@@ -7,9 +15,9 @@
 	- Eliminated the dual-role behavior of WebPluginStream.
 
 	Renamed WebPluginStream to WebBaseNetscapePluginStream.
-	WebNetscapePluginRepresentation, a subclass of WebNetscapePluginRepresentation,
+	WebNetscapePluginRepresentation, a subclass of WebBaseNetscapePluginStream,
 	is the document representation for standalone plug-ins.
-	WebNetscapePluginStream, also a subclass of WebNetscapePluginRepresentation,
+	WebNetscapePluginStream, also a subclass of WebBaseNetscapePluginStream,
 	is the general plug-in stream loader for embedded plug-ins or plug-in requested streams.
 
 	23 plug-in source files with more likely to come!
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
index 127689f..d530742 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -8,14 +8,14 @@
 #import <WebKit/npapi.h>
 #import <WebKit/WebBaseNetscapePluginStream.h>
 
- at class WebBaseNetscapePluginView;
+ at class WebNetscapePluginEmbeddedView;
 @class WebResourceHandle;
 @class WebResourceRequest;
 @protocol WebResourceHandleDelegate;
 
 @interface WebNetscapePluginStream : WebBaseNetscapePluginStream <WebResourceHandleDelegate>
 {
-    WebBaseNetscapePluginView *view;
+    WebNetscapePluginEmbeddedView *view;
     
     WebResourceRequest *request;
     WebResourceHandle *resource;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 8fdf478..453c0af 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -34,7 +34,7 @@
     
     [self setPluginPointer:thePluginPointer];
 
-    view = [(WebBaseNetscapePluginView *)instance->ndata retain];
+    view = [(WebNetscapePluginEmbeddedView *)instance->ndata retain];
 
     notifyData = theNotifyData;
     resourceData = [[NSMutableData alloc] init];

-- 
WebKit Debian packaging