Changeset 31355

Timestamp:

03/26/08 20:58:19 (8 months ago)

Author:

beidson@apple.com

Message:

WebCore:

2008-03-26 Brady Eidson <beidson@apple.com>

Reviewed by Mark Rowe

Part of the continued push to move WebArchive-related code down to WebCore, this
moves subresourceForURL: down to DocumentLoader->subresource()

• WebCore.base.exp:
• loader/DocumentLoader.cpp: (WebCore::DocumentLoader::subresource): Create an ArchiveResource from a CachedResource if it exists Otherwise, fallback to an ArchiveResource from the current Archive if any. Otherwise, return null
• loader/DocumentLoader.h:

• loader/archive/ArchiveResource.cpp: (WebCore::ArchiveResource::create): (WebCore::ArchiveResource::ArchiveResource):
• loader/archive/ArchiveResource.h:

WebKit/mac:

2008-03-26 Brady Eidson <beidson@apple.com>

Reviewed by Mark Rowe

Part of the continued push to move WebArchive-related code down to WebCore, this
moves subresourceForURL: down to DocumentLoader->subresource()

• WebView/WebDataSource.mm: (-subresourceForURL:): Call through to the DocumentLoader

• WebView/WebFrame.mm: Remove _getData:andResponse:forURL:, as its only use has now been ported down to WebCore
• WebView/WebFrameInternal.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/loader/DocumentLoader.cpp (modified) (1 diff)
• WebCore/loader/DocumentLoader.h (modified) (1 diff)
• WebCore/loader/archive/ArchiveResource.cpp (modified) (2 diffs)
• WebCore/loader/archive/ArchiveResource.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebDataSource.mm (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (1 diff)
• WebKit/mac/WebView/WebFrameInternal.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-26  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Mark Rowe
+
+        Part of the continued push to move WebArchive-related code down to WebCore, this
+        moves [WebDataSource subresourceForURL:] down to DocumentLoader->subresource()
+
+        * WebCore.base.exp:
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::subresource): Create an ArchiveResource from a CachedResource if it exists
+          Otherwise, fallback to an ArchiveResource from the current Archive if any.  Otherwise, return null
+        * loader/DocumentLoader.h:
+
+        * loader/archive/ArchiveResource.cpp:
+        (WebCore::ArchiveResource::create):
+        (WebCore::ArchiveResource::ArchiveResource):
+        * loader/archive/ArchiveResource.h:
+
 2008-03-26  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/WebCore.base.exp

@@ -266 +266 @@
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
 __ZN7WebCore14CachedResource5derefEPNS_20CachedResourceClientE
+__ZN7WebCore14DocumentLoader11subresourceERKNS_4KURLE
 __ZN7WebCore14DocumentLoader13attachToFrameEv
 __ZN7WebCore14DocumentLoader15detachFromFrameEv

trunk/WebCore/loader/DocumentLoader.cpp

@@ -466 +466 @@
 }
 
+PassRefPtr<ArchiveResource> DocumentLoader::subresource(const KURL& url)
+{
+    if (!isCommitted())
+        return 0;
+    
+    Document* doc = m_frame->document();
+    if (!doc)
+        return archiveResourceForURL(url);
+        
+    CachedResource* resource = doc->docLoader()->cachedResource(url);
+    if (!resource)
+        return archiveResourceForURL(url);
+        
+    return ArchiveResource::create(resource->data(), url, resource->response());
+}
+
 ArchiveResource* DocumentLoader::archiveResourceForURL(const KURL& url)
 {

trunk/WebCore/loader/DocumentLoader.h

@@ -123 +123 @@
         void addAllArchiveResources(Archive*);
         void addArchiveResource(PassRefPtr<ArchiveResource>);
+        
+        // Return an ArchiveResource for the URL, either creating from live data or
+        // pulling from the ArchiveResourceCollection
+        PassRefPtr<ArchiveResource> subresource(const KURL&);
+        // Return the ArchiveResource for the URL only when loading an Archive
         ArchiveResource* archiveResourceForURL(const KURL&);
+        
         PassRefPtr<Archive> popArchiveForSubframe(const String& frameName);
         void clearArchiveResources();

trunk/WebCore/loader/archive/ArchiveResource.cpp

@@ -34 +34 @@
 namespace WebCore {
 
+PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
+{
+    return adoptRef(new ArchiveResource(data, url, response));
+}
+
 PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const String& mimeType, const String& textEncoding, const String& frameName)
 {
@@ -42 +47 @@
 {
     return adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName, resourceResponse));
+}
+
+ArchiveResource::ArchiveResource(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
+    : m_data(data)
+    , m_url(url)
+    , m_mimeType(response.mimeType())
+    , m_textEncoding(response.textEncodingName())
+    , m_response(response)
+{
 }
 

trunk/WebCore/loader/archive/ArchiveResource.h

@@ -41 +41 @@
 class ArchiveResource : public RefCounted<ArchiveResource> {
 public:
+    static PassRefPtr<ArchiveResource> create(PassRefPtr<SharedBuffer>, const KURL&, const ResourceResponse&);
     static PassRefPtr<ArchiveResource> create(PassRefPtr<SharedBuffer>, const KURL&, const String& mimeType, const String& textEncoding, const String& frameName);
     static PassRefPtr<ArchiveResource> create(PassRefPtr<SharedBuffer>, const KURL&, const String& mimeType, const String& textEncoding, const String& frameName, const ResourceResponse&);
@@ -56 +57 @@
 
 private:
+    ArchiveResource(PassRefPtr<SharedBuffer>, const KURL&, const ResourceResponse&);
     ArchiveResource(PassRefPtr<SharedBuffer>, const KURL&, const String& mimeType, const String& textEncoding, const String& frameName);
     ArchiveResource(PassRefPtr<SharedBuffer>, const KURL&, const String& mimeType, const String& textEncoding, const String& frameName, const ResourceResponse&);

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-03-26  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Mark Rowe
+
+        Part of the continued push to move WebArchive-related code down to WebCore, this
+        moves [WebDataSource subresourceForURL:] down to DocumentLoader->subresource()
+
+        * WebView/WebDataSource.mm:
+        (-[WebDataSource subresourceForURL:]): Call through to the DocumentLoader 
+
+        * WebView/WebFrame.mm: Remove [WebFrame _getData:andResponse:forURL:], as its only use
+          has now been ported down to WebCore
+        * WebView/WebFrameInternal.h:
+
 2008-03-26  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/mac/WebView/WebDataSource.mm

@@ -483 +483 @@
 - (WebResource *)subresourceForURL:(NSURL *)URL
 {
-    if (!_private->loader->isCommitted())
-        return nil;
-
-    NSData *data;
-    NSURLResponse *response;
-    if (![[self webFrame] _getData:&data andResponse:&response forURL:[URL _web_originalDataAsString]]) {
-        DocumentLoader* loader = [self _documentLoader];
-        ArchiveResource* coreResource = loader->archiveResourceForURL(URL);
-        return coreResource ? [[[WebResource alloc] _initWithCoreResource:coreResource] autorelease] : nil;
-    }
-
-    return [[[WebResource alloc] _initWithData:data URL:URL response:response] autorelease];
+    RefPtr<ArchiveResource> subresource = _private->loader->subresource(URL);
+    
+    return subresource ? [[[WebResource alloc] _initWithCoreResource:subresource.get()] autorelease] : nil;
 }
 

trunk/WebKit/mac/WebView/WebFrame.mm

@@ -971 +971 @@
 }
 
-- (BOOL)_getData:(NSData **)data andResponse:(NSURLResponse **)response forURL:(NSString *)url
-{
-    Document* doc = _private->coreFrame->document();
-    if (!doc)
-        return NO;
-
-    CachedResource* resource = doc->docLoader()->cachedResource(url);
-    if (!resource)
-        return NO;
-
-    SharedBuffer* buffer = resource->data();
-    if (buffer)
-        *data = [buffer->createNSData() autorelease];
-    else
-        *data = nil;
-
-    *response = resource->response().nsURLResponse();
-    return YES;
-}
-
 - (void)_getAllResourceDatas:(NSArray **)datas andResponses:(NSArray **)responses
 {

trunk/WebKit/mac/WebView/WebFrameInternal.h

@@ -182 +182 @@
 - (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation;
 
-- (BOOL)_getData:(NSData **)data andResponse:(NSURLResponse **)response forURL:(NSString *)URL;
 - (void)_getAllResourceDatas:(NSArray **)datas andResponses:(NSArray **)responses;