Changeset 29352 in webkit

Timestamp:

Jan 10, 2008 7:28:59 AM (16 years ago)

Author:

Simon Hausmann

Message:

​http://bugs.webkit.org/show_bug.cgi?id=16588

Added a (last) Frame argument to ResourceHandle::loadResourceSynchronously.
This allows implementing the synchronous loading correctly for the Qt port where the networking
backend is bound to the page.

Signed-off-by: Lars

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• platform/network/ResourceHandle.h (modified) (1 diff)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (1 diff)
• platform/network/curl/ResourceHandleCurl.cpp (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (1 diff)
• platform/network/qt/ResourceHandleQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-10  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Lars.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16588
+
+        Added a (last) Frame argument to ResourceHandle::loadResourceSynchronously.
+        This allows implementing the synchronous loading correctly for the Qt port where the networking
+        backend is bound to the page.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadResourceSynchronously):
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+
 2008-01-10  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -3294 +3294 @@
         ASSERT(!newRequest.isNull());
         didTellClientAboutLoad(newRequest.url().string());
-        ResourceHandle::loadResourceSynchronously(newRequest, error, response, data);
+        ResourceHandle::loadResourceSynchronously(newRequest, error, response, data, m_frame);
     }
     

trunk/WebCore/platform/network/ResourceHandle.h

@@ -93 +93 @@
     static PassRefPtr<ResourceHandle> create(const ResourceRequest&, ResourceHandleClient*, Frame*, bool defersLoading, bool shouldContentSniff, bool mightDownloadFromHandle = false);
 
-    static void loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data);
+    static void loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data, Frame* frame);
     static bool willLoadFromCache(ResourceRequest&);
     

trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -356 +356 @@
 }
 
-void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& vector)
+void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& vector, Frame*)
 {
     ASSERT(!request.isEmpty());

trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp

@@ -90 +90 @@
 }
 
-void ResourceHandle::loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>&)
+void ResourceHandle::loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>&, Frame*)
 {
     notImplemented();

trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -230 +230 @@
 }
 
-void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data)
+void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data, Frame*)
 {
     NSError *nsError = nil;

trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp

@@ -170 +170 @@
 }
 
-void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data)
-{
-#if QT_VERSION < 0x040400
+void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data, Frame* frame)
+{
     WebCoreSynchronousLoader syncLoader;
     ResourceHandle handle(request, &syncLoader, true, false, true);
 
+#if QT_VERSION < 0x040400
     if (!QWebNetworkManager::self()->add(&handle, QWebNetworkInterface::defaultInterface(), QWebNetworkManager::SynchronousJob)) {
         // FIXME Create a sane ResourceError
@@ -181 +181 @@
         return;
     }
+#else
+    ResourceHandleInternal *d = handle.getInternal();
+    d->m_frame = static_cast<FrameLoaderClientQt*>(frame->loader()->client())->webFrame();
+    d->m_job = new QNetworkReplyHandler(&handle);
+#endif
 
     syncLoader.waitForCompletion();
@@ -187 +192 @@
     qDebug() << data.size();
     response = syncLoader.resourceResponse();
-#else
-    notImplemented(); // #### implement me
-#endif
 }