From 94a0c143a8f897a963662a1e81d0347291e6e039 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Wed, 4 Mar 2009 07:41:24 +0000 Subject: Reduce string conversions related to cookie handling, and eliminate some unnecessary WebKit:: scoping. This is part of a speculative fix for the intl1 page cycler regression. TBR=dglazkov Review URL: http://codereview.chromium.org/39120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10884 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/renderer_webkitclient_impl.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'chrome/renderer/renderer_webkitclient_impl.cc') diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index 958efd5..1d69817 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -23,20 +23,21 @@ using WebKit::WebURL; void RendererWebKitClientImpl::setCookies( const WebURL& url, const WebURL& policy_url, const WebString& value) { + std::string value_utf8; + UTF16ToUTF8(value.characters(), value.length(), &value_utf8); RenderThread::current()->Send( - new ViewHostMsg_SetCookie(url, policy_url, UTF16ToUTF8(value))); + new ViewHostMsg_SetCookie(url, policy_url, value_utf8)); } -WebKit::WebString RendererWebKitClientImpl::cookies( - const WebKit::WebURL& url, const WebKit::WebURL& policy_url) { +WebString RendererWebKitClientImpl::cookies( + const WebURL& url, const WebURL& policy_url) { std::string value; RenderThread::current()->Send( new ViewHostMsg_GetCookies(url, policy_url, &value)); - return UTF8ToUTF16(value); + return WebString::fromUTF8(value); } -void RendererWebKitClientImpl::prefetchHostName( - const WebKit::WebString& hostname) { +void RendererWebKitClientImpl::prefetchHostName(const WebString& hostname) { if (!hostname.isEmpty()) { std::string hostname_utf8; UTF16ToUTF8(hostname.characters(), hostname.length(), &hostname_utf8); @@ -44,7 +45,7 @@ void RendererWebKitClientImpl::prefetchHostName( } } -WebKit::WebString RendererWebKitClientImpl::defaultLocale() { +WebString RendererWebKitClientImpl::defaultLocale() { // TODO(darin): Eliminate this webkit_glue call. return WideToUTF16(webkit_glue::GetWebKitLocale()); } -- cgit v1.1