bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 939b32ee (#454471)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-03-03 17:37:23 -05:00
parent fe68aee82c
commit 54647945f1
127 changed files with 1874 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcef/renderer/frame_impl.cc
View File

@@ -168,7 +168,8 @@ void CefFrameImpl::ExecuteJavaScript(const CefString& jsCode,
if (frame_) {
GURL gurl = GURL(scriptUrl.ToString());
frame_->executeScript(
blink::WebScriptSource(jsCode.ToString16(), gurl, startLine));
blink::WebScriptSource(WebString::fromUTF16(jsCode.ToString16()), gurl,
startLine));
}
}
@@ -193,7 +194,7 @@ CefString CefFrameImpl::GetName() {
CEF_REQUIRE_RT_RETURN(name);
if (frame_)
name = frame_->uniqueName();
name = frame_->uniqueName().utf16();
return name;
}