Reviewed by Anders.

        Fixed an assertion failure I ran into while debugging <rdar://problem/4652683>.

        * Plugins/WebNetscapePluginEmbeddedView.m:
        (-[WebNetscapePluginEmbeddedView redeliverStream]):
        Don't clear the "instance" ivar here.  This code was refactored here from the old WebNetscapePluginRepresentation,
        which also had an "instance" ivar.  It is never appropriate to clear a plug-in view's instance.  That is done when
        the plug-in is destroyed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ff068e9644124d6fc415cd854c238ada2b454483..ccbf229e94dac2355c263afef5543b97ac423bab 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2006-08-01  Tim Omernick  <timo@apple.com>
+
+        Reviewed by Anders.
+
+        Fixed an assertion failure I ran into while debugging <rdar://problem/4652683>.
+
+        * Plugins/WebNetscapePluginEmbeddedView.m:
+        (-[WebNetscapePluginEmbeddedView redeliverStream]):
+        Don't clear the "instance" ivar here.  This code was refactored here from the old WebNetscapePluginRepresentation,
+        which also had an "instance" ivar.  It is never appropriate to clear a plug-in view's instance.  That is done when
+        the plug-in is destroyed.
+
 2006-08-01  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Geoff.

diff --git a/WebKit/Plugins/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins/WebNetscapePluginEmbeddedView.m
index 9d070b24c6d047633850e28c2a2734cb84abe3ba..1d56007343a7843127f34247bcf5de496bb83b3d 100644 (file)
--- a/WebKit/Plugins/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins/WebNetscapePluginEmbeddedView.m
@@ -180,7 +180,6 @@
         // Deliver what has not been passed to the plug-in up to this point.
         if (_dataLengthReceived > 0) {
             NSData *data = [[[self dataSource] data] subdataWithRange:NSMakeRange(0, _dataLengthReceived)];
-            instance = NULL;
             _dataLengthReceived = 0;
             [self pluginView:self receivedData:data];
             if (![[self dataSource] isLoading]) {