From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 22 Jul 2010 15:37:06 +0100
Subject: Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
---
 WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp')

diff --git a/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp b/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp
index 7c60d3d..a24ca37 100644
--- a/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp
@@ -81,6 +81,22 @@ bool LoadItem::invoke() const
     return true;
 }
 
+bool LoadHTMLStringItem::invoke() const
+{
+    wstring content = jsStringRefToWString(m_content.get());
+    wstring baseURL = jsStringRefToWString(m_baseURL.get());
+
+    BSTR contentBSTR = SysAllocString(content.c_str());
+    BSTR baseURLBSTR = SysAllocString(baseURL.c_str());
+
+    frame->loadHTMLString(contentBSTR, baseURLBSTR);
+
+    SysFreeString(contentBSTR);
+    SysFreeString(baseURLBSTR);
+
+    return true;
+}
+
 bool ReloadItem::invoke() const
 {
     COMPtr<IWebView> webView;
-- 
cgit v1.1