diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp')
| -rw-r--r-- | Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp b/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp index 0f44f54..d10b193 100644 --- a/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp +++ b/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp @@ -61,6 +61,12 @@ bool LoadHTMLStringItem::invoke() const { GOwnPtr<gchar> content(JSStringCopyUTF8CString(m_content.get())); GOwnPtr<gchar> baseURL(JSStringCopyUTF8CString(m_baseURL.get())); + + if (m_unreachableURL) { + GOwnPtr<gchar> unreachableURL(JSStringCopyUTF8CString(m_unreachableURL.get())); + webkit_web_frame_load_alternate_string(mainFrame, content.get(), baseURL.get(), unreachableURL.get()); + return true; + } webkit_web_frame_load_string(mainFrame, content.get(), 0, 0, baseURL.get()); return true; } |