Changeset 19322 in webkit

Timestamp:

Jan 31, 2007 7:51:00 PM (17 years ago)

Author:

andersca

Message:

LayoutTests:

Reviewed by Maciej.

<rdar://problem/4886776>
REGRESSION: After opening a web archive, location shows the actual URL, not the webarchive file

• webarchive/loading/resources/helloworld.webarchive: Added.
• webarchive/loading/test-loading-archive-expected.txt: Added.
• webarchive/loading/test-loading-archive.html: Added.

WebCore:

Reviewed by Maciej.

<rdar://problem/4886776>
REGRESSION: After opening a web archive, location shows the actual URL, not the webarchive file

• WebCore.exp:
• loader/FrameLoader.cpp: (WebCore::FrameLoader::continueLoadWithData):
• loader/FrameLoader.h: New function which continues a load but using a given buffer instead.

WebKit:

Reviewed by Maciej.

<rdar://problem/4886776>
REGRESSION: After opening a web archive, location shows the actual URL, not the webarchive file

"Revert" the change done in 13734.

• WebView/WebHTMLRepresentation.mm: (-[WebHTMLRepresentation loadArchive]): Don't do a new load here, as this would cancel the current load and call the resource load delegate's didFailLoadingWithError: method. Instead, call continueLoadWithData.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webarchive/loading (added)
• LayoutTests/webarchive/loading/resources (added)
• LayoutTests/webarchive/loading/resources/helloworld.webarchive (added)
• LayoutTests/webarchive/loading/test-loading-archive-expected.txt (added)
• LayoutTests/webarchive/loading/test-loading-archive.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebHTMLRepresentation.mm (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-31  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/4886776>
+        REGRESSION: After opening a web archive, location shows the actual URL, not the webarchive file
+
+        * webarchive/loading/resources/helloworld.webarchive: Added.
+        * webarchive/loading/test-loading-archive-expected.txt: Added.
+        * webarchive/loading/test-loading-archive.html: Added.
+
 2007-01-31  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-31  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/4886776>
+        REGRESSION: After opening a web archive, location shows the actual URL, not the webarchive file
+
+        * WebCore.exp:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::continueLoadWithData):
+        * loader/FrameLoader.h:
+        New function which continues a load but using a given buffer instead.
+        
 2007-01-31  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/WebCore.exp

@@ -139 +139 @@
 __ZN7WebCore11FrameLoader16detachFromParentEv
 __ZN7WebCore11FrameLoader18currentHistoryItemEv
+__ZN7WebCore11FrameLoader20continueLoadWithDataEPNS_12SharedBufferERKNS_6StringES5_RKNS_4KURLE
 __ZN7WebCore11FrameLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
 __ZN7WebCore11FrameLoader21setCurrentHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE

trunk/WebCore/loader/FrameLoader.cpp

@@ -4279 +4279 @@
 }
 
+void FrameLoader::continueLoadWithData(SharedBuffer* buffer, const String& mimeType, const String& textEncoding, const KURL& url)
+{
+    m_responseMIMEType = mimeType;
+    didOpenURL(url);
+
+    String encoding;
+    if (m_frame)
+        encoding = documentLoader()->overrideEncoding();
+    bool userChosen = !encoding.isNull();
+    if (encoding.isNull())
+        encoding = textEncoding;
+    setEncoding(encoding, userChosen);
+
+    if (!m_frame->document())
+        return;
+
+    addData(buffer->data(), buffer->size());
+}
+
 } // namespace WebCore

trunk/WebCore/loader/FrameLoader.h

@@ -421 +421 @@
         void setProvisionalHistoryItem(PassRefPtr<HistoryItem>);
         
+        void continueLoadWithData(SharedBuffer*, const String& mimeType, const String& textEncoding, const KURL&); 
     private:        
         PassRefPtr<HistoryItem> createHistoryItem(bool useOriginal);

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-01-31  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/4886776>
+        REGRESSION: After opening a web archive, location shows the actual URL, not the webarchive file
+        
+        "Revert" the change done in 13734.
+        
+        * WebView/WebHTMLRepresentation.mm:
+        (-[WebHTMLRepresentation loadArchive]):
+        Don't do a new load here, as this would cancel the current load and call the resource load
+        delegate's didFailLoadingWithError: method. Instead, call continueLoadWithData.
+
 2007-02-01  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebKit/WebView/WebHTMLRepresentation.mm

@@ -47 +47 @@
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
+#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameMac.h>
 #import <WebCore/MimeTypeRegistry.h>
@@ -190 +191 @@
 }
 
-- (void)loadArchive
+- (void)_loadDataSourceAsWebArchive
 {
     WebArchive *archive = [[WebArchive alloc] initWithData:[_private->dataSource data]];
-    [[_private->dataSource webFrame] loadArchive:archive];
+    WebResource *mainResource = [archive mainResource];
+    if (!mainResource) {
+        [archive release];
+        return;
+    }
+    
+    NSData *data = [mainResource data];
+    [data retain];
+    [_private->parsedArchiveData release];
+    _private->parsedArchiveData = data;
+    
+    [_private->dataSource _addToUnarchiveState:archive];
+    [archive release];
+    
+    WebFrame *webFrame = [_private->dataSource webFrame];
+    
+    if (!webFrame)
+        return;
+    
+    core(webFrame)->loader()->continueLoadWithData(SharedBuffer::wrapNSData(data).get(), [mainResource MIMEType], [mainResource textEncodingName], [mainResource URL]);
 }
 
@@ -207 +227 @@
     if (frame) {
         if ([self _isDisplayingWebArchive])
-            [self loadArchive];
+            [self _loadDataSourceAsWebArchive];
         else
             // Telling the bridge we received some data and passing nil as the data is our
@@ -232 +252 @@
 - (NSString *)documentSource
 {
+    if ([self _isDisplayingWebArchive])
+        return [[[NSString alloc] initWithData:_private->parsedArchiveData encoding:NSUTF8StringEncoding] autorelease]; 
+
     return [_private->bridge stringWithData:[_private->dataSource data]];
 }