Reviewed by Brady.

        - move more code from WebDataSource to WebFrameLoader

        Also marked a few more methods in WebDataSource as likely MOVABLE in a future round, since they do not
        use any of WebDataSource's private data.

        * Loader/WebFrameLoader.h:
        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader addPlugInStreamLoader:]):
        (-[WebFrameLoader removePlugInStreamLoader:]):
        (-[WebFrameLoader addSubresourceLoader:]):
        (-[WebFrameLoader removeSubresourceLoader:]):
        (-[WebFrameLoader _didReceiveAuthenticationChallenge:forResource:]):
        (-[WebFrameLoader _didCancelAuthenticationChallenge:forResource:]):
        (-[WebFrameLoader _didReceiveResponse:forResource:]):
        (-[WebFrameLoader _didReceiveData:contentLength:forResource:]):
        (-[WebFrameLoader _didFinishLoadingForResource:]):
        (-[WebFrameLoader _didFailLoadingWithError:forResource:]):
        (-[WebFrameLoader _privateBrowsingEnabled]):
        (-[WebFrameLoader _finishedLoadingResource]):
        (-[WebFrameLoader _receivedError:]):
        (-[WebFrameLoader _finishedLoading]):
        * Loader/WebMainResourceLoader.m:
        (-[WebMainResourceLoader didReceiveData:lengthReceived:allAtOnce:]):
        (-[WebMainResourceLoader didFinishLoading]):
        * Loader/WebNetscapePlugInStreamLoader.m:
        (-[WebNetscapePlugInStreamLoader didFinishLoading]):
        (-[WebNetscapePlugInStreamLoader didFailWithError:]):
        (-[WebNetscapePlugInStreamLoader cancelWithError:]):
        * Loader/WebSubresourceLoader.m:
        (+[WebSubresourceLoader startLoadingResource:withRequest:customHeaders:referrer:forFrameLoader:]):
        (-[WebSubresourceLoader signalFinish]):
        (-[WebSubresourceLoader didFailWithError:]):
        (-[WebSubresourceLoader cancel]):
        * Plugins/WebNetscapePluginStream.m:
        (-[WebNetscapePluginStream start]):
        * WebView/WebDataSource.m:
        (-[WebDataSource _replaceSelectionWithArchive:selectReplacement:]):
        (-[WebDataSource _updateIconDatabaseWithURL:]):
        (-[WebDataSource _loadIcon]):
        (-[WebDataSource _setPrimaryLoadComplete:]):
        (-[WebDataSource _cancelledError]):
        (+[WebDataSource _repTypesAllowImageTypeOmission:]):
        (+[WebDataSource _representationClassForMIMEType:]):
        (-[WebDataSource _commitLoadWithData:]):
        (-[WebDataSource _receivedMainResourceError:complete:]):
        (-[WebDataSource _iconLoaderReceivedPageIcon:]):
        (-[WebDataSource _isDocumentHTML]):
        * WebView/WebDataSourceInternal.h:

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index aaa80c27bb4110831cda7f60f20f9f163ae1ccbf..e283e13a86ef936a152116ad8b54d91bf41a2c08 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,56 @@
+2006-08-21  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Brady.
+        
+        - move more code from WebDataSource to WebFrameLoader
+        
+        Also marked a few more methods in WebDataSource as likely MOVABLE in a future round, since they do not
+        use any of WebDataSource's private data.
+
+        * Loader/WebFrameLoader.h:
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader addPlugInStreamLoader:]):
+        (-[WebFrameLoader removePlugInStreamLoader:]):
+        (-[WebFrameLoader addSubresourceLoader:]):
+        (-[WebFrameLoader removeSubresourceLoader:]):
+        (-[WebFrameLoader _didReceiveAuthenticationChallenge:forResource:]):
+        (-[WebFrameLoader _didCancelAuthenticationChallenge:forResource:]):
+        (-[WebFrameLoader _didReceiveResponse:forResource:]):
+        (-[WebFrameLoader _didReceiveData:contentLength:forResource:]):
+        (-[WebFrameLoader _didFinishLoadingForResource:]):
+        (-[WebFrameLoader _didFailLoadingWithError:forResource:]):
+        (-[WebFrameLoader _privateBrowsingEnabled]):
+        (-[WebFrameLoader _finishedLoadingResource]):
+        (-[WebFrameLoader _receivedError:]):
+        (-[WebFrameLoader _finishedLoading]):
+        * Loader/WebMainResourceLoader.m:
+        (-[WebMainResourceLoader didReceiveData:lengthReceived:allAtOnce:]):
+        (-[WebMainResourceLoader didFinishLoading]):
+        * Loader/WebNetscapePlugInStreamLoader.m:
+        (-[WebNetscapePlugInStreamLoader didFinishLoading]):
+        (-[WebNetscapePlugInStreamLoader didFailWithError:]):
+        (-[WebNetscapePlugInStreamLoader cancelWithError:]):
+        * Loader/WebSubresourceLoader.m:
+        (+[WebSubresourceLoader startLoadingResource:withRequest:customHeaders:referrer:forFrameLoader:]):
+        (-[WebSubresourceLoader signalFinish]):
+        (-[WebSubresourceLoader didFailWithError:]):
+        (-[WebSubresourceLoader cancel]):
+        * Plugins/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginStream start]):
+        * WebView/WebDataSource.m:
+        (-[WebDataSource _replaceSelectionWithArchive:selectReplacement:]):
+        (-[WebDataSource _updateIconDatabaseWithURL:]):
+        (-[WebDataSource _loadIcon]):
+        (-[WebDataSource _setPrimaryLoadComplete:]):
+        (-[WebDataSource _cancelledError]):
+        (+[WebDataSource _repTypesAllowImageTypeOmission:]):
+        (+[WebDataSource _representationClassForMIMEType:]):
+        (-[WebDataSource _commitLoadWithData:]):
+        (-[WebDataSource _receivedMainResourceError:complete:]):
+        (-[WebDataSource _iconLoaderReceivedPageIcon:]):
+        (-[WebDataSource _isDocumentHTML]):
+        * WebView/WebDataSourceInternal.h:
+
 2006-08-21  Brady Eidson  <beidson@apple.com>
 
         Reviewed by John

diff --git a/WebKit/Loader/WebFrameLoader.h b/WebKit/Loader/WebFrameLoader.h
index 3def63719b436a58e07f95c9dced9ec8efdb1c8e..a11dc374d9a1cb588f3db36ad04c45f7b8f2cecb 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.h
+++ b/WebKit/Loader/WebFrameLoader.h
@@ -99,12 +99,8 @@
 - (void)_didFailLoadingWithError:(NSError *)error forResource:(id)identifier;
 - (BOOL)_privateBrowsingEnabled;
 - (void)_didFailLoadingWithError:(NSError *)error forResource:(id)identifier;
-- (void)_addPlugInStreamLoader:(WebLoader *)loader;
-- (void)_removePlugInStreamLoader:(WebLoader *)loader;
 - (void)_finishedLoadingResource;
 - (void)_receivedError:(NSError *)error;
-- (void)_addSubresourceLoader:(WebLoader *)loader;
-- (void)_removeSubresourceLoader:(WebLoader *)loader;
 - (NSURLRequest *)_originalRequest;
 - (WebFrame *)webFrame;
 - (void)_receivedMainResourceError:(NSError *)error complete:(BOOL)isComplete;
@@ -119,7 +115,6 @@
 - (void)_setResponse:(NSURLResponse *)response;
 - (void)_mainReceivedError:(NSError *)error complete:(BOOL)isComplete;
 - (void)_finishedLoading;
-- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar complete:(BOOL)isComplete;
 - (void)_iconLoaderReceivedPageIcon:(WebIconLoader *)iconLoader;
 - (NSURL *)_URL;
 

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index 3f9c4d824b54764a8be029617cad2e48bf9d8308..2746861979de48b87ee9802c523482eaf98c7a75 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -39,6 +39,7 @@
 #import <WebKit/WebResourcePrivate.h>
 #import <WebKit/DOMHTML.h>
 #import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebPreferences.h>
 
 @implementation WebFrameLoader
 
@@ -88,11 +89,13 @@
     if (!plugInStreamLoaders)
         plugInStreamLoaders = [[NSMutableArray alloc] init];
     [plugInStreamLoaders addObject:loader];
+    [[self activeDataSource] _setLoading:YES];
 }
 
 - (void)removePlugInStreamLoader:(WebLoader *)loader
 {
     [plugInStreamLoaders removeObject:loader];
+    [[self activeDataSource] _updateLoading];
 }    
 
 - (void)setDefersCallbacks:(BOOL)defers
@@ -150,11 +153,13 @@
     if (subresourceLoaders == nil)
         subresourceLoaders = [[NSMutableArray alloc] init];
     [subresourceLoaders addObject:loader];
+    [[self activeDataSource] _setLoading:YES];
 }
 
 - (void)removeSubresourceLoader:(WebLoader *)loader
 {
     [subresourceLoaders removeObject:loader];
+    [[self activeDataSource] _updateLoading];
 }
 
 - (NSData *)mainResourceData
@@ -377,67 +382,47 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)_didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)currentWebChallenge forResource:(id)identifier
 {
-    return [[self activeDataSource] _didReceiveAuthenticationChallenge:currentWebChallenge forResource:identifier];
+    [[self activeDataSource] _didReceiveAuthenticationChallenge:currentWebChallenge forResource:identifier];
 }
 
 - (void)_didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)currentWebChallenge forResource:(id)identifier
 {
-    return [[self activeDataSource] _didCancelAuthenticationChallenge:currentWebChallenge forResource:identifier];
+    [[self activeDataSource] _didCancelAuthenticationChallenge:currentWebChallenge forResource:identifier];
 }
 
 - (void)_didReceiveResponse:(NSURLResponse *)r forResource:(id)identifier
 {
-    return [[self activeDataSource] _didReceiveResponse:r forResource:identifier];
+    [[self activeDataSource] _didReceiveResponse:r forResource:identifier];
 }
 
 - (void)_didReceiveData:(NSData *)data contentLength:(int)lengthReceived forResource:(id)identifier
 {
-    return [[self activeDataSource] _didReceiveData:data contentLength:lengthReceived forResource:identifier];
+    [[self activeDataSource] _didReceiveData:data contentLength:lengthReceived forResource:identifier];
 }
 
 - (void)_didFinishLoadingForResource:(id)identifier
 {
-    return [[self activeDataSource] _didFinishLoadingForResource:identifier];
+    [[self activeDataSource] _didFinishLoadingForResource:identifier];
 }
 
 - (void)_didFailLoadingWithError:(NSError *)error forResource:(id)identifier
 {
-    return [[self activeDataSource] _didFailLoadingWithError:error forResource:identifier];
+    [[self activeDataSource] _didFailLoadingWithError:error forResource:identifier];
 }
 
 - (BOOL)_privateBrowsingEnabled
 {
-    return [[self activeDataSource] _privateBrowsingEnabled];
-}
-
-- (void)_addPlugInStreamLoader:(WebLoader *)loader
-{
-    return [[self activeDataSource] _addPlugInStreamLoader:loader];
-}
-
-- (void)_removePlugInStreamLoader:(WebLoader *)loader
-{
-    return [[self activeDataSource] _removePlugInStreamLoader:loader];
+    return [[[webFrame webView] preferences] privateBrowsingEnabled];
 }
 
 - (void)_finishedLoadingResource
 {
-    return [[self activeDataSource] _finishedLoadingResource];
+    [webFrame _checkLoadComplete];
 }
 
 - (void)_receivedError:(NSError *)error
 {
-    [[self webFrame] _checkLoadComplete];
-}
-
-- (void)_addSubresourceLoader:(WebLoader *)loader
-{
-    return [[self activeDataSource] _addSubresourceLoader:loader];
-}
-
-- (void)_removeSubresourceLoader:(WebLoader *)loader
-{
-    return [[self activeDataSource] _removeSubresourceLoader:loader];
+    [webFrame _checkLoadComplete];
 }
 
 - (NSURLRequest *)_originalRequest
@@ -510,12 +495,20 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)_finishedLoading
 {
-    [[self activeDataSource] _finishedLoading];
-}
+    WebDataSource *ds = [self activeDataSource];
+    
+    [self retain];
+    [ds _finishedLoading];
 
-- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar complete:(BOOL)isComplete
-{
-    [[self activeDataSource] _mainReceivedBytesSoFar:bytesSoFar complete:isComplete];
+    if ([ds _mainDocumentError] || ![ds webFrame]) {
+        [self release];
+        return;
+    }
+
+    [ds _setPrimaryLoadComplete:YES];
+    [webFrame _checkLoadComplete];
+
+    [self release];
 }
 
 - (void)_iconLoaderReceivedPageIcon:(WebIconLoader *)iLoader

diff --git a/WebKit/Loader/WebMainResourceLoader.m b/WebKit/Loader/WebMainResourceLoader.m
index 7090e89ef8186d7452f4f56d79cc7c6551805f28..2116b80b19d5a20f07fad0b4e079f255c510c5d4 100644 (file)
--- a/WebKit/Loader/WebMainResourceLoader.m
+++ b/WebKit/Loader/WebMainResourceLoader.m
@@ -368,7 +368,6 @@ static BOOL shouldLoadAsEmptyDocument(NSURL *url)
     // retain/release self in this delegate method since the additional processing can do
     // anything including possibly releasing self; one example of this is 3266216
     [self retain];
-    [frameLoader _mainReceivedBytesSoFar:_bytesReceived complete:NO];
     
     [super didReceiveData:data lengthReceived:lengthReceived allAtOnce:allAtOnce];
     _bytesReceived += [data length];
@@ -385,7 +384,6 @@ static BOOL shouldLoadAsEmptyDocument(NSURL *url)
     [self retain];
 
     [frameLoader _finishedLoading];
-    [frameLoader _mainReceivedBytesSoFar:_bytesReceived complete:YES];
     [super didFinishLoading];
 
     [self release];

diff --git a/WebKit/Loader/WebNetscapePlugInStreamLoader.m b/WebKit/Loader/WebNetscapePlugInStreamLoader.m
index 0eae96a5032457793faa8024cf41e4277be6bf8e..c9fa54aa27f87ac027cb441c90e0f53b47ad62b8 100644 (file)
--- a/WebKit/Loader/WebNetscapePlugInStreamLoader.m
+++ b/WebKit/Loader/WebNetscapePlugInStreamLoader.m
@@ -88,7 +88,7 @@
     // Calling _removePlugInStreamLoader will likely result in a call to release, so we must retain.
     [self retain];
 
-    [frameLoader _removePlugInStreamLoader:self];
+    [frameLoader removePlugInStreamLoader:self];
     [frameLoader _finishedLoadingResource];
     [stream finishedLoadingWithData:[self resourceData]];
     [super didFinishLoading];
@@ -103,7 +103,7 @@
     // one example of this is 3266216
     [self retain];
 
-    [[self frameLoader] _removePlugInStreamLoader:self];
+    [[self frameLoader] removePlugInStreamLoader:self];
     [[self frameLoader] _receivedError:error];
     [stream destroyStreamWithError:error];
     [super didFailWithError:error];
@@ -116,7 +116,7 @@
     // Calling _removePlugInStreamLoader will likely result in a call to release, so we must retain.
     [self retain];
 
-    [[self frameLoader] _removePlugInStreamLoader:self];
+    [[self frameLoader] removePlugInStreamLoader:self];
     [stream destroyStreamWithError:error];
     [super cancelWithError:error];
 

diff --git a/WebKit/Loader/WebSubresourceLoader.m b/WebKit/Loader/WebSubresourceLoader.m
index 13d2e8bcb4b0a22acbcfcb5a7e962876f7f7b949..594d008fc20b837e8da0497a1f841b01d02f3e33 100644 (file)
--- a/WebKit/Loader/WebSubresourceLoader.m
+++ b/WebKit/Loader/WebSubresourceLoader.m
@@ -98,7 +98,7 @@ static void setHTTPReferrer(NSMutableURLRequest *request, NSString *theReferrer)
 {
     WebSubresourceLoader *loader = [[[self alloc] initWithLoader:rLoader frameLoader:fl] autorelease];
     
-    [fl _addSubresourceLoader:loader];
+    [fl addSubresourceLoader:loader];
 
     NSEnumerator *e = [customHeaders keyEnumerator];
     NSString *key;
@@ -228,7 +228,7 @@ static void setHTTPReferrer(NSMutableURLRequest *request, NSString *theReferrer)
 
 - (void)signalFinish
 {
-    [frameLoader _removeSubresourceLoader:self];
+    [frameLoader removeSubresourceLoader:self];
     [frameLoader _finishedLoadingResource];
     [super signalFinish];
 }
@@ -254,7 +254,7 @@ static void setHTTPReferrer(NSMutableURLRequest *request, NSString *theReferrer)
     [self retain];
     
     [coreLoader reportError];
-    [frameLoader _removeSubresourceLoader:self];
+    [frameLoader removeSubresourceLoader:self];
     [self receivedError:error];
     [super didFailWithError:error];
 
@@ -267,7 +267,7 @@ static void setHTTPReferrer(NSMutableURLRequest *request, NSString *theReferrer)
     [self retain];
         
     [coreLoader cancel];
-    [frameLoader _removeSubresourceLoader:self];
+    [frameLoader removeSubresourceLoader:self];
     [self receivedError:[self cancelledError]];
     [super cancel];
 

diff --git a/WebKit/Plugins/WebNetscapePluginStream.m b/WebKit/Plugins/WebNetscapePluginStream.m
index 4ba28851a7e8592548c17ad5dc18ab8a6cd0a025..fef0f7502c01bbc0b786290d2e9e18a515ff0390 100644 (file)
--- a/WebKit/Plugins/WebNetscapePluginStream.m
+++ b/WebKit/Plugins/WebNetscapePluginStream.m
@@ -90,11 +90,11 @@
 {
     ASSERT(request);
 
-    [[_loader frameLoader] _addPlugInStreamLoader:_loader];
+    [[_loader frameLoader] addPlugInStreamLoader:_loader];
 
     BOOL succeeded = [_loader loadWithRequest:request];
     if (!succeeded) {
-        [[_loader frameLoader] _removePlugInStreamLoader:_loader];
+        [[_loader frameLoader] removePlugInStreamLoader:_loader];
     }
 }
 

diff --git a/WebKit/WebView/WebDataSource.m b/WebKit/WebView/WebDataSource.m
index de3db29b885718e8ff83485496ea78c871bd44af..9afdb40e6a82e5071b0aaf1ceea532867532b443 100644 (file)
--- a/WebKit/WebView/WebDataSource.m
+++ b/WebKit/WebView/WebDataSource.m
@@ -265,9 +265,8 @@
 - (void)_replaceSelectionWithArchive:(WebArchive *)archive selectReplacement:(BOOL)selectReplacement
 {
     DOMDocumentFragment *fragment = [self _documentFragmentWithArchive:archive];
-    if (fragment) {
+    if (fragment)
         [[self _bridge] replaceSelectionWithFragment:fragment selectReplacement:selectReplacement smartReplace:NO matchStyle:NO];
-    }
 }
 
 - (WebView *)_webView
@@ -304,6 +303,7 @@
 
 - (void)_updateIconDatabaseWithURL:(NSURL *)iconURL
 {
+    // MOVABLE
     ASSERT([[WebIconDatabase sharedIconDatabase] _isEnabled]);
     
     WebIconDatabase *iconDB = [WebIconDatabase sharedIconDatabase];
@@ -334,9 +334,8 @@
 {
     // Don't load an icon if 1) this is not the main frame 2) we ended in error
     // 3) they aren't saved by the DB
-    if ([self webFrame] != [[self _webView] mainFrame] || _private->mainDocumentError || ![[WebIconDatabase sharedIconDatabase] _isEnabled]) {
+    if ([self webFrame] != [[self _webView] mainFrame] || _private->mainDocumentError || ![[WebIconDatabase sharedIconDatabase] _isEnabled])
         return;
-    }
 
     if (!_private->iconURL) {
         // No icon URL from the LINK tag so try the server's root.
@@ -367,7 +366,7 @@
     }
 }
 
-- (void)_setPrimaryLoadComplete: (BOOL)flag
+- (void)_setPrimaryLoadComplete:(BOOL)flag
 {
     _private->primaryLoadComplete = flag;
     
@@ -391,6 +390,7 @@
 
 - (NSError *)_cancelledError
 {
+    // MOVABLE
     return [NSError _webKitErrorWithDomain:NSURLErrorDomain
                                       code:NSURLErrorCancelled
                                        URL:[self _URL]];
@@ -489,30 +489,6 @@
         [self _updateLoading];
 }
 
-- (void)_addSubresourceLoader:(WebLoader *)loader
-{
-    [[_private->webFrame _frameLoader] addSubresourceLoader:loader];
-    [self _setLoading:YES];
-}
-
-- (void)_removeSubresourceLoader:(WebLoader *)loader
-{
-    [[_private->webFrame _frameLoader] removeSubresourceLoader:loader];
-    [self _updateLoading];
-}
-
-- (void)_addPlugInStreamLoader:(WebLoader *)loader
-{
-    [[_private->webFrame _frameLoader] addPlugInStreamLoader:loader];
-    [self _setLoading:YES];
-}
-
-- (void)_removePlugInStreamLoader:(WebLoader *)loader
-{
-    [[_private->webFrame _frameLoader] removePlugInStreamLoader:loader];
-    [self _updateLoading];
-}
-
 - (BOOL)_isStopping
 {
     return _private->stopping;
@@ -692,6 +668,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 + (NSMutableDictionary *)_repTypesAllowImageTypeOmission:(BOOL)allowImageTypeOmission
 {
+    // MOVABLE
     static NSMutableDictionary *repTypes = nil;
     static BOOL addedImageTypes = NO;
     
@@ -715,6 +692,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 + (Class)_representationClassForMIMEType:(NSString *)MIMEType
 {
+    // MOVABLE
     Class repClass;
     return [WebView _viewClass:nil andRepresentationClass:&repClass forMIMEType:MIMEType] ? repClass : nil;
 }
@@ -749,6 +727,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 - (void)_commitLoadWithData:(NSData *)data
 {
+    // MOVABLE
     // Both unloading the old page and parsing the new page may execute JavaScript which destroys the datasource
     // by starting a new load, so retain temporarily.
     [self retain];
@@ -783,6 +762,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 - (void)_receivedMainResourceError:(NSError *)error complete:(BOOL)isComplete
 {
+    // MOVABLE
     WebFrameBridge *bridge = [[self webFrame] _bridge];
     
     // Retain the bridge because the stop may release the last reference to it.
@@ -806,6 +786,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 - (void)_iconLoaderReceivedPageIcon:(WebIconLoader *)iconLoader
 {
+    // MOVABLE
     [self _updateIconDatabaseWithURL:_private->iconURL];
     [self _notifyIconChanged:_private->iconURL];
 }
@@ -946,11 +927,6 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
                  proxy:proxy];
 }
 
-- (BOOL)_privateBrowsingEnabled
-{
-    return [[[self _webView] preferences] privateBrowsingEnabled];
-}    
-
 - (NSURLRequest *)_originalRequest
 {
     return _private->originalRequestCopy;
@@ -1035,6 +1011,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 - (BOOL)_isDocumentHTML
 {
+    // MOVABLE
     NSString *MIMEType = [[self response] MIMEType];
     return [WebView canShowMIMETypeAsHTML:MIMEType];
 }
@@ -1247,28 +1224,6 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
     }
 }
 
-- (void)_finishedLoadingResource
-{
-    [[self webFrame] _checkLoadComplete];
-}
-
-- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar complete:(BOOL)isComplete
-{
-    WebFrame *frame = [self webFrame];
-    
-    // The frame may be nil if a previously cancelled load is still making progress callbacks.
-    if (frame == nil)
-        return;
-        
-    // This resource has completed, so check if the load is complete for this frame and its ancestors
-    if (isComplete) {
-        // If the load is complete, mark the primary load as done.  The primary load is the load
-        // of the main document.  Other resources may still be arriving.
-        [self _setPrimaryLoadComplete:YES];
-        [frame _checkLoadComplete];
-    }
-}
-
 - (void)_mainReceivedError:(NSError *)error complete:(BOOL)isComplete
 {
     if (![self webFrame])

diff --git a/WebKit/WebView/WebDataSourceInternal.h b/WebKit/WebView/WebDataSourceInternal.h
index 7b5e570f90b81c2bdbe2d7fb4281aab4acb365d7..fce77c4fdaed80ecf4347686b733d6181d0d1de0 100644 (file)
--- a/WebKit/WebView/WebDataSourceInternal.h
+++ b/WebKit/WebView/WebDataSourceInternal.h
@@ -50,8 +50,6 @@
 @protocol WebDocumentRepresentation;
 
 @interface WebDataSource (WebInternal)
-- (void)_addPlugInStreamLoader:(WebLoader *)loader;
-- (void)_removePlugInStreamLoader:(WebLoader *)loader;
 - (void)_stopLoadingWithError:(NSError *)error;
 - (void)_setTitle:(NSString *)title;
 - (NSString *)_overrideEncoding;
@@ -60,8 +58,6 @@
 - (NSString *)_overrideEncoding;
 - (void)_setIconURL:(NSURL *)URL;
 - (void)_setIconURL:(NSURL *)URL withType:(NSString *)iconType;
-- (void)_addSubresourceLoader:(WebLoader *)loader;
-- (void)_removeSubresourceLoader:(WebLoader *)loader;
 - (NSURLRequest *)_originalRequest;
 - (WebView *)_webView;
 - (WebResource *)_archivedSubresourceForURL:(NSURL *)URL;
@@ -106,8 +102,6 @@
 - (void)_startLoading;
 - (void)_loadFromPageCache:(NSDictionary *)pageCache;
 - (DOMElement *)_imageElementWithImageResource:(WebResource *)resource;
-- (void)_finishedLoadingResource;
-- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar complete:(BOOL)isComplete;
 - (void)_mainReceivedError:(NSError *)error complete:(BOOL)isComplete;
 - (BOOL)_defersCallbacks;
 - (id)_identifierForInitialRequest:(NSURLRequest *)clientRequest;
@@ -121,5 +115,6 @@
 - (void)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)r proxy:(WKNSURLConnectionDelegateProxyPtr) proxy;
 - (BOOL)_privateBrowsingEnabled;
 - (void)_decidePolicyForMIMEType:(NSString *)MIMEType decisionListener:(WebPolicyDecisionListener *)listener;
-
+- (void)_setLoading:(BOOL)loading;
+- (void)_updateLoading;
 @end