[webkit-changes] cvs commit: WebKit/WebView.subproj WebDataSource.m
WebMainResourceClient.m
Timothy
thatcher at opensource.apple.com
Fri Sep 16 12:35:41 PDT 2005
thatcher 05/09/16 12:35:41
Modified: . Tag: Safari-2-0-branch ChangeLog
Misc.subproj Tag: Safari-2-0-branch WebKitErrorsPrivate.h
Plugins.subproj Tag: Safari-2-0-branch
WebPluginDocumentView.m
WebView.subproj Tag: Safari-2-0-branch WebDataSource.m
WebMainResourceClient.m
Log:
Merged fix from TOT to Safari-2-0-branch
2005-09-14 Justin Garcia <justin.garcia at apple.com>
Reviewed by john
Fixes <rdar://problem/4237479> REGRESSION (Cambridge-Denver): old QuickTime movie continues to play sound after reload
We were adding the movie to the document twice after the changes were added to handle fallback content.
There are some errors for which we should not render fall back content
* Misc.subproj/WebKitErrorsPrivate.h:
Introduced WebKitErrorPlugInWillHandleLoad to represent the cancel we do
to prevent loading plugin content twice
* Plugins.subproj/WebPluginDocumentView.m:
(-[WebPluginDocumentView dataSourceUpdated:]): Ditto
* WebView.subproj/WebDataSource.m:
(-[WebDataSource _receivedMainResourceError:complete:]):
Don't handleFallbackContent on WebKitErrorPlugInWillHandleLoad or on a user cancel
Revision Changes Path
No revision
No revision
1.3118.4.68 +23 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3118.4.67
retrieving revision 1.3118.4.68
diff -u -r1.3118.4.67 -r1.3118.4.68
--- ChangeLog 9 Sep 2005 18:29:50 -0000 1.3118.4.67
+++ ChangeLog 16 Sep 2005 19:35:31 -0000 1.3118.4.68
@@ -1,3 +1,26 @@
+2005-09-16 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ 2005-09-14 Justin Garcia <justin.garcia at apple.com>
+
+ Reviewed by john
+
+ Fixes <rdar://problem/4237479> REGRESSION (Cambridge-Denver): old QuickTime movie continues to play sound after reload
+ We were adding the movie to the document twice after the changes were added to handle fallback content.
+ There are some errors for which we should not render fall back content
+
+ * Misc.subproj/WebKitErrorsPrivate.h:
+ Introduced WebKitErrorPlugInWillHandleLoad to represent the cancel we do
+ to prevent loading plugin content twice
+
+ * Plugins.subproj/WebPluginDocumentView.m:
+ (-[WebPluginDocumentView dataSourceUpdated:]): Ditto
+
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource _receivedMainResourceError:complete:]):
+ Don't handleFallbackContent on WebKitErrorPlugInWillHandleLoad or on a user cancel
+
=== WebKit-416.7 ===
2005-09-08 Adele Peterson <adele at apple.com>
No revision
No revision
1.9.10.1 +2 -0 WebKit/Misc.subproj/WebKitErrorsPrivate.h
Index: WebKitErrorsPrivate.h
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebKitErrorsPrivate.h,v
retrieving revision 1.9
retrieving revision 1.9.10.1
diff -u -r1.9 -r1.9.10.1
--- WebKitErrorsPrivate.h 30 Sep 2004 17:52:27 -0000 1.9
+++ WebKitErrorsPrivate.h 16 Sep 2005 19:35:39 -0000 1.9.10.1
@@ -8,6 +8,8 @@
#import <WebKit/WebKitErrors.h>
#define WebKitErrorPlugInCancelledConnection 203
+// FIXME: WebKitErrorPlugInWillHandleLoad is used for the cancel we do to prevent loading plugin content twice. See <rdar://problem/4258008>
+#define WebKitErrorPlugInWillHandleLoad 204
@interface NSError (WebKitExtras)
+ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL;
No revision
No revision
1.4.10.1 +2 -1 WebKit/Plugins.subproj/WebPluginDocumentView.m
Index: WebPluginDocumentView.m
===================================================================
RCS file: /cvs/root/WebKit/Plugins.subproj/WebPluginDocumentView.m,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -r1.4 -r1.4.10.1
--- WebPluginDocumentView.m 20 Oct 2004 18:21:47 -0000 1.4
+++ WebPluginDocumentView.m 16 Sep 2005 19:35:39 -0000 1.4.10.1
@@ -82,7 +82,8 @@
{
// Cancel the load since WebKit plug-ins do their own loading.
NSURLResponse *response = [dataSource response];
- NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorPlugInCancelledConnection
+ // FIXME: See <rdar://problem/4258008>
+ NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorPlugInWillHandleLoad
contentURL:[response URL]
pluginPageURL:nil
pluginName:[plugin name]
No revision
No revision
1.198.8.4 +3 -1 WebKit/WebView.subproj/WebDataSource.m
Index: WebDataSource.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSource.m,v
retrieving revision 1.198.8.3
retrieving revision 1.198.8.4
diff -u -r1.198.8.3 -r1.198.8.4
--- WebDataSource.m 9 Sep 2005 17:17:01 -0000 1.198.8.3
+++ WebDataSource.m 16 Sep 2005 19:35:40 -0000 1.198.8.4
@@ -819,7 +819,9 @@
if (isComplete) {
// Can't call [self _bridge] because we might not have commited yet
[[[self webFrame] _bridge] stop];
- [[[self webFrame] _bridge] mainResourceError];
+ // FIXME: WebKitErrorPlugInWillHandleLoad is a workaround for the cancel we do to prevent loading plugin content twice. See <rdar://problem/4258008>
+ if ([error code] != NSURLErrorCancelled && [error code] != WebKitErrorPlugInWillHandleLoad)
+ [[[self webFrame] _bridge] handleFallbackContent];
}
[[self webFrame] _receivedMainResourceError:error];
1.260.8.5 +1 -1 WebKit/WebView.subproj/Attic/WebMainResourceClient.m
Index: WebMainResourceClient.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/Attic/WebMainResourceClient.m,v
retrieving revision 1.260.8.4
retrieving revision 1.260.8.5
diff -u -r1.260.8.4 -r1.260.8.5
--- WebMainResourceClient.m 9 Sep 2005 17:17:04 -0000 1.260.8.4
+++ WebMainResourceClient.m 16 Sep 2005 19:35:40 -0000 1.260.8.5
@@ -247,7 +247,7 @@
int status = [(NSHTTPURLResponse *)r statusCode];
if (status < 200 || status >= 300) {
// Handle <object> fallback for error cases.
- [[[dataSource webFrame] _bridge] mainResourceError];
+ [[[dataSource webFrame] _bridge] handleFallbackContent];
}
}
More information about the webkit-changes
mailing list