Changeset 32543

Timestamp:

04/25/08 00:53:18 (23 months ago)

Author:

hausmann@webkit.org

Message:

Holger Hans Peter Freyther < zecke@selfish.org>

Implement dumping of resource load callbacks to pass http/tests/xmlhttprequest/abort-should-cancel-load.html

Similar to Editing and Frameloading we do the dumping within WebCore

Location:

trunk

Files:

• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (4 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/jsobjects.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/jsobjects.h (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2008-04-25  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Simon.
+
+        Implement dumping of resource load callbacks to pass http/tests/xmlhttprequest/abort-should-cancel-load.html
+        
+        Similar to Editing and Frameloading we do the dumping within WebCore
+        
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (qt_dump_frame_loader):
+        (qt_dump_resource_load_callbacks):
+        (drtDescriptionSuitableForTestResult):
+        (WebCore::FrameLoaderClientQt::dispatchDidFailLoading):
+        (WebCore::FrameLoaderClientQt::dispatchDidLoadResourceFromMemoryCache):
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):
+
 2008-04-24  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -67 +67 @@
 
 static bool dumpFrameLoaderCallbacks = false;
+static bool dumpResourceLoadCallbacks = false;
+
+static QMap<unsigned long, QString> dumpAssignedUrls;
 
 void QWEBKIT_EXPORT qt_dump_frame_loader(bool b)
 {
     dumpFrameLoaderCallbacks = b;
+}
+
+void QWEBKIT_EXPORT qt_dump_resource_load_callbacks(bool b)
+{
+    dumpResourceLoadCallbacks = b;
 }
 
@@ -95 +103 @@
     QUrl url = _url;
     return url.toString();
+}
+
+static QString drtDescriptionSuitableForTestResult(const WebCore::ResourceError& error)
+{
+    QString failingURL = error.failingURL();
+    return QString::fromLatin1("<NSError domain NSURLErrorDomain, code %1, failing URL \"%2\">").arg(error.errorCode()).arg(failingURL);
+}
+
+static QString drtDescriptionSuitableForTestResult(const WebCore::ResourceRequest& request)
+{
+    QString url = request.url().string();
+    return QString::fromLatin1("<NSURLRequest %1>").arg(url);
+}
+
+static QString drtDescriptionSuitableForTestResult(const WebCore::ResourceResponse& response)
+{
+    QString text = response.httpStatusText();
+    if (text.isEmpty())
+        return QLatin1String("(null)");
+
+    return text;
 }
 
@@ -700 +729 @@
 }
 
-void FrameLoaderClientQt::assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&)
-{
-}
-
-void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long, WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
-{
+void FrameLoaderClientQt::assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader* loader, const WebCore::ResourceRequest& request)
+{
+    if (dumpResourceLoadCallbacks)
+        dumpAssignedUrls[identifier] = drtDescriptionSuitableForTestResult(request.url());
+}
+
+void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest& newRequest, const WebCore::ResourceResponse& redirectResponse)
+{
+    if (dumpResourceLoadCallbacks)
+        printf("%s - willSendRequest %s redirectResponse %s\n",
+               qPrintable(dumpAssignedUrls[identifier]),
+               qPrintable(drtDescriptionSuitableForTestResult(newRequest)),
+               qPrintable(drtDescriptionSuitableForTestResult(redirectResponse)));
+
     // seems like the Mac code doesn't do anything here by default neither
     //qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string`();
@@ -736 +773 @@
 }
 
-void FrameLoaderClientQt::dispatchDidFailLoading(WebCore::DocumentLoader* loader, unsigned long, const WebCore::ResourceError&)
-{
+void FrameLoaderClientQt::dispatchDidFailLoading(WebCore::DocumentLoader* loader, unsigned long identifier, const WebCore::ResourceError& error)
+{
+    if (dumpResourceLoadCallbacks)
+        printf("%s - didFailLoadingWithError: %s\n", qPrintable(dumpAssignedUrls[identifier]), qPrintable(drtDescriptionSuitableForTestResult(error)));
+
     if (m_firstData) {
         FrameLoader *fl = loader->frameLoader();

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2008-04-25  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Simon.
+
+        Implement dumping of resource load callbacks to pass http/tests/xmlhttprequest/abort-should-cancel-load.html
+        
+        Similar to Editing and Frameloading we do the dumping within WebCore
+        
+
+        * DumpRenderTree/qt/jsobjects.cpp:
+        (LayoutTestController::dumpResourceLoadCallbacks):
+        * DumpRenderTree/qt/jsobjects.h:
+
 2008-04-24  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 

trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp

@@ -36 +36 @@
 #include "DumpRenderTree.h"
 extern void qt_dump_editing_callbacks(bool b);
+extern void qt_dump_resource_load_callbacks(bool b);
 
 LayoutTestController::LayoutTestController(WebCore::DumpRenderTree *drt)
@@ -108 +109 @@
     qDebug() << ">>>dumpEditingCallbacks";
     qt_dump_editing_callbacks(true);
+}
+
+void LayoutTestController::dumpResourceLoadCallbacks()
+{
+    qt_dump_resource_load_callbacks(true);
 }
 

trunk/WebKitTools/DumpRenderTree/qt/jsobjects.h

@@ -69 +69 @@
     void notifyDone();
     void dumpEditingCallbacks();
+    void dumpResourceLoadCallbacks();
     void queueReload();
     void provisionalLoad();