From 54588cab1f4fe4b878767012c04df8b2ec9bc1b4 Mon Sep 17 00:00:00 2001 From: mjs Date: Tue, 15 Aug 2006 05:38:32 +0000 Subject: [PATCH] Reviewed by Beth. - remove many (but not all) WebKit dependencies from WebNetscapePlugInStreamLoader (it still depends on WebNetscapePluginStream). * Loader/WebFrameLoader.h: * Loader/WebFrameLoader.m: (-[WebFrameLoader fileDoesNotExistErrorWithResponse:]): * Loader/WebNetscapePlugInStreamLoader.h: * Loader/WebNetscapePlugInStreamLoader.m: (-[WebNetscapePlugInStreamLoader initWithStream:frameLoader:]): (-[WebNetscapePlugInStreamLoader releaseResources]): (-[WebNetscapePlugInStreamLoader didReceiveResponse:]): * Plugins/WebNetscapePluginStream.m: (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15869 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/ChangeLog | 18 ++++++++++++++++++ WebKit/Loader/WebFrameLoader.h | 1 + WebKit/Loader/WebFrameLoader.m | 7 +++++++ WebKit/Loader/WebNetscapePlugInStreamLoader.h | 4 +--- WebKit/Loader/WebNetscapePlugInStreamLoader.m | 13 +++---------- WebKit/Plugins/WebNetscapePluginStream.m | 3 +-- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index f14011b9f877..b93aca89197d 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,21 @@ +2006-08-14 Maciej Stachowiak + + Reviewed by Beth. + + - remove many (but not all) WebKit dependencies from WebNetscapePlugInStreamLoader (it still + depends on WebNetscapePluginStream). + + * Loader/WebFrameLoader.h: + * Loader/WebFrameLoader.m: + (-[WebFrameLoader fileDoesNotExistErrorWithResponse:]): + * Loader/WebNetscapePlugInStreamLoader.h: + * Loader/WebNetscapePlugInStreamLoader.m: + (-[WebNetscapePlugInStreamLoader initWithStream:frameLoader:]): + (-[WebNetscapePlugInStreamLoader releaseResources]): + (-[WebNetscapePlugInStreamLoader didReceiveResponse:]): + * Plugins/WebNetscapePluginStream.m: + (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]): + 2006-08-14 Maciej Stachowiak Reviewed by Tim Omernick. diff --git a/WebKit/Loader/WebFrameLoader.h b/WebKit/Loader/WebFrameLoader.h index 8777e03fcac2..bb77325d7df2 100644 --- a/WebKit/Loader/WebFrameLoader.h +++ b/WebKit/Loader/WebFrameLoader.h @@ -124,6 +124,7 @@ - (NSURL *)_URL; - (NSError *)cancelledErrorWithRequest:(NSURLRequest *)request; +- (NSError *)fileDoesNotExistErrorWithResponse:(NSURLResponse *)response; - (BOOL)willUseArchiveForRequest:(NSURLRequest *)r originalURL:(NSURL *)originalURL loader:(WebLoader *)loader; - (BOOL)archiveLoadPendingForLoader:(WebLoader *)loader; - (void)deliverArchivedResourcesAfterDelay; diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m index 0de4a35d4912..ae282b9d12ee 100644 --- a/WebKit/Loader/WebFrameLoader.m +++ b/WebKit/Loader/WebFrameLoader.m @@ -534,6 +534,13 @@ static CFAbsoluteTime _timeOfLastCompletedLoad; URL:[request URL]]; } +- (NSError *)fileDoesNotExistErrorWithResponse:(NSURLResponse *)response +{ + return [NSError _webKitErrorWithDomain:NSURLErrorDomain + code:NSURLErrorFileDoesNotExist + URL:[response URL]]; +} + - (void)clearArchivedResources { [pendingArchivedResources removeAllObjects]; diff --git a/WebKit/Loader/WebNetscapePlugInStreamLoader.h b/WebKit/Loader/WebNetscapePlugInStreamLoader.h index 976361b0babc..ccc3c23e91e0 100644 --- a/WebKit/Loader/WebNetscapePlugInStreamLoader.h +++ b/WebKit/Loader/WebNetscapePlugInStreamLoader.h @@ -30,14 +30,12 @@ #import @class WebNetscapePluginStream; -@class WebBaseNetscapePluginView; @interface WebNetscapePlugInStreamLoader : WebLoader { WebNetscapePluginStream *stream; - WebBaseNetscapePluginView *view; } -- initWithStream:(WebNetscapePluginStream *)theStream view:(WebBaseNetscapePluginView *)theView; +- (id)initWithStream:(WebNetscapePluginStream *)theStream frameLoader:(WebFrameLoader *)fl; - (BOOL)isDone; @end diff --git a/WebKit/Loader/WebNetscapePlugInStreamLoader.m b/WebKit/Loader/WebNetscapePlugInStreamLoader.m index 0db41eda3dd9..6c097c29f3d2 100644 --- a/WebKit/Loader/WebNetscapePlugInStreamLoader.m +++ b/WebKit/Loader/WebNetscapePlugInStreamLoader.m @@ -31,17 +31,14 @@ #import #import -#import -#import @implementation WebNetscapePlugInStreamLoader -- (id)initWithStream:(WebNetscapePluginStream *)theStream view:(WebBaseNetscapePluginView *)theView +- (id)initWithStream:(WebNetscapePluginStream *)theStream frameLoader:(WebFrameLoader *)fl { [super init]; stream = [theStream retain]; - view = [theView retain]; - [self setFrameLoader:[[theView webFrame] _frameLoader]]; + [self setFrameLoader:fl]; return self; } @@ -54,8 +51,6 @@ { [stream release]; stream = nil; - [view release]; - view = nil; [super releaseResources]; } @@ -72,9 +67,7 @@ if (stream) { if ([theResponse isKindOfClass:[NSHTTPURLResponse class]] && ([(NSHTTPURLResponse *)theResponse statusCode] >= 400 || [(NSHTTPURLResponse *)theResponse statusCode] < 100)) { - NSError *error = [NSError _webKitErrorWithDomain:NSURLErrorDomain - code:NSURLErrorFileDoesNotExist - URL:[theResponse URL]]; + NSError *error = [frameLoader fileDoesNotExistErrorWithResponse:theResponse]; [stream cancelLoadAndDestroyStreamWithError:error]; } } diff --git a/WebKit/Plugins/WebNetscapePluginStream.m b/WebKit/Plugins/WebNetscapePluginStream.m index 0e4cd43415dc..cb2f02645141 100644 --- a/WebKit/Plugins/WebNetscapePluginStream.m +++ b/WebKit/Plugins/WebNetscapePluginStream.m @@ -72,8 +72,7 @@ [(NSMutableURLRequest *)request _web_setHTTPReferrer:nil]; } - _loader = [[WebNetscapePlugInStreamLoader alloc] initWithStream:self view:view]; - [_loader setFrameLoader:[[view webFrame] _frameLoader]]; + _loader = [[WebNetscapePlugInStreamLoader alloc] initWithStream:self frameLoader:[[view webFrame] _frameLoader]]; isTerminated = NO; -- 2.36.0