From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h')

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h b/WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h
index eb5d312..cc4337b 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h
@@ -50,6 +50,7 @@ extern HWND webViewWindow;
 
 std::wstring urlSuitableForTestResult(const std::wstring& url);
 std::string toUTF8(BSTR);
+std::string toUTF8(const std::wstring&);
 IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow = 0);
 Vector<HWND>& openWindows();
 typedef HashMap<HWND, COMPtr<IWebView> > WindowToWebViewMap;
-- 
cgit v1.1