Changeset 24366 in webkit

Timestamp:

Jul 17, 2007, 11:27:04 AM (18 years ago)

Author:

tristan

Message:

Reviewed by Maciej Stachowiak.

<rdar://problem/5294691> Source of file is misrepresented if downloaded by typing in URL in Safari address bar

• loader/FrameLoaderClient.h:
• loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::continueAfterContentPolicy): Added an extra request parameter, initialRequest, to the download() method by passing up the resource handle's request.

• platform/graphics/svg/SVGImageEmptyClients.h: (WebCore::SVGEmptyFrameLoaderClient::download): Added an extra parameter to the empty SVG download method.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoaderClient.h (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (1 diff)
• platform/graphics/svg/SVGImageEmptyClients.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-17  Tristan O'Tierney  <tristan@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/5294691> Source of file is misrepresented if downloaded by typing in URL in Safari address bar
+
+        * loader/FrameLoaderClient.h:
+        * loader/MainResourceLoader.cpp:        
+        (WebCore::MainResourceLoader::continueAfterContentPolicy):
+        Added an extra request parameter, initialRequest, to the download() method
+        by passing up the resource handle's request.
+        
+        * platform/graphics/svg/SVGImageEmptyClients.h:
+        (WebCore::SVGEmptyFrameLoaderClient::download):
+        Added an extra parameter to the empty SVG download method.
+        
 2007-07-17  Antti  <antti@apple.com>
 

trunk/WebCore/loader/FrameLoaderClient.h

@@ -193 +193 @@
         virtual void saveDocumentViewToCachedPage(CachedPage*) = 0;
         virtual bool canCachePage() const = 0;
-        virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceResponse&) = 0;
+        virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&) = 0;
 
         virtual Frame* createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,

trunk/WebCore/loader/MainResourceLoader.cpp

@@ -198 +198 @@
 
     case PolicyDownload:
-        frameLoader()->client()->download(m_handle.get(), request(), r);
+        frameLoader()->client()->download(m_handle.get(), request(), m_handle.get()->request(), r);
         receivedError(interruptionForPolicyChangeError());
         return;

trunk/WebCore/platform/graphics/svg/SVGImageEmptyClients.h

@@ -155 +155 @@
     virtual void detachedFromParent4() { }
     
-    virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceResponse&) { }
+    virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&) { }
     
     virtual void assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&) { }