2009-04-26 Gustavo Noronha Silva <gns@gnome.org>

        Reviewed by Xan Lopez.

        Resolve relative URLs when queueing loads. This fixes
        post-goback-same-url.html timing out.

        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
        (LayoutTestController::queueLoad):

git-svn-id: svn://svn.chromium.org/blink/trunk@42880 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKitTools/ChangeLog

+2009-04-26  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Reviewed by Xan Lopez.
+
+        Resolve relative URLs when queueing loads. This fixes
+        post-goback-same-url.html timing out.
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::queueLoad):
+
 2009-04-24  Kevin Ollivier  <kevino@theolliviers.com>
 
         wx build fix. Switching JSCore from a static lib to a dynamic lib

third_party/WebKit/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

@@ -117,8 +117,19 @@ JSStringRef LayoutTestController::pathToLocalResource(JSContextRef context, JSSt
 
 void LayoutTestController::queueLoad(JSStringRef url, JSStringRef target)
 {
-    // FIXME: We need to resolve relative URLs here
-    WorkQueue::shared()->queue(new LoadItem(url, target));
+    const gchar* baseURI = webkit_web_frame_get_uri(mainFrame);
+    gchar* lastSlash = g_strrstr(baseURI, "/");
+
+    GString* absoluteURLCString = g_string_new_len(baseURI, static_cast<gssize>(lastSlash - baseURI + 1));
+
+    gchar* relativeURL = JSStringCopyUTF8CString(url);
+    g_string_append(absoluteURLCString, relativeURL);
+    g_free(relativeURL);
+
+    JSRetainPtr<JSStringRef> absoluteURL(Adopt, JSStringCreateWithUTF8CString(absoluteURLCString->str));
+    g_string_free(absoluteURLCString, true);
+
+    WorkQueue::shared()->queue(new LoadItem(absoluteURL.get(), target));
 }
 
 void LayoutTestController::setAcceptsEditing(bool acceptsEditing)