Changeset 15867 in webkit

Timestamp:

Aug 14, 2006 8:52:34 PM (18 years ago)

Author:

mjs

Message:

LayoutTests:

Test case not reviewed but the patch was reviewed by Tim Omernick.

• test case for REGRESSION: crash when leaving youtube page while movie is still loading ​http://bugzilla.opendarwin.org/show_bug.cgi?id=10398

• http/tests/plugins/interrupted-get-url.html: Added.
• http/tests/plugins/resources/interrupted-get-url-success.html: Added.
• http/tests/plugins/resources/slow-resource.pl: Added.

WebKit:

Reviewed by Tim Omernick.

• fixed REGRESSION: crash when leaving youtube page while movie is still loading ​http://bugzilla.opendarwin.org/show_bug.cgi?id=10398

• Loader/WebNetscapePlugInStreamLoader.m: (-[WebNetscapePlugInStreamLoader initWithStream:view:]): Set the frame loader for this stream. (-[WebNetscapePlugInStreamLoader cancelWithError:]): Make sure to destroy the stream as well; otherwise, when we try to clean up later, we won't have the right context.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/plugins (added)
• LayoutTests/http/tests/plugins/interrupted-get-url.html (added)
• LayoutTests/http/tests/plugins/resources (added)
• LayoutTests/http/tests/plugins/resources/interrupted-get-url-success.html (added)
• LayoutTests/http/tests/plugins/resources/slow-resource.pl (added)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Loader/WebNetscapePlugInStreamLoader.m (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-08-14  Maciej Stachowiak  <mjs@apple.com>
+
+        Test case not reviewed but the patch was reviewed by Tim Omernick.
+        
+        - test case for REGRESSION: crash when leaving youtube page while movie is still loading
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10398
+
+        * http/tests/plugins/interrupted-get-url.html: Added.
+        * http/tests/plugins/resources/interrupted-get-url-success.html: Added.
+        * http/tests/plugins/resources/slow-resource.pl: Added.
+
 2006-08-14  Darin Adler  <darin@apple.com>
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-08-14  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Tim Omernick.
+        
+        - fixed REGRESSION: crash when leaving youtube page while movie is still loading
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10398
+
+        * Loader/WebNetscapePlugInStreamLoader.m:
+        (-[WebNetscapePlugInStreamLoader initWithStream:view:]): Set the frame loader for this stream.
+        (-[WebNetscapePlugInStreamLoader cancelWithError:]): Make sure to destroy the stream as well;
+        otherwise, when we try to clean up later, we won't have the right context.
+
 2006-08-14  David Hyatt  <hyatt@apple.com>
 

trunk/WebKit/Loader/WebNetscapePlugInStreamLoader.m

@@ -33 +33 @@
 #import <WebKit/WebNetscapePluginStream.h>
 #import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebFrameInternal.h>
 
 @implementation WebNetscapePlugInStreamLoader
 
-- initWithStream:(WebNetscapePluginStream *)theStream view:(WebBaseNetscapePluginView *)theView
+- (id)initWithStream:(WebNetscapePluginStream *)theStream view:(WebBaseNetscapePluginView *)theView
 {
     [super init];
     stream = [theStream retain];
     view = [theView retain];
+    [self setFrameLoader:[[theView webFrame] _frameLoader]];
     return self;
 }
@@ -125 +127 @@
 
     [[self frameLoader] _removePlugInStreamLoader:self];
+    [stream destroyStreamWithError:error];
     [super cancelWithError:error];