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

10
libcef/renderer/dom_document_impl.cc
View File

@ -77,14 +77,14 @@ CefString CefDOMDocumentImpl::GetTitle() {
const WebDocument& document = frame_->document();
const WebString& title = document.title();
if (!title.isNull())
str = title;
str = title.utf16();
return str;
}
CefRefPtr<CefDOMNode> CefDOMDocumentImpl::GetElementById(const CefString& id) {
const WebDocument& document = frame_->document();
return GetOrCreateNode(document.getElementById(base::string16(id)));
return GetOrCreateNode(document.getElementById(WebString::fromUTF16(id)));
}
CefRefPtr<CefDOMNode> CefDOMDocumentImpl::GetFocusedNode() {
@ -140,7 +140,7 @@ CefString CefDOMDocumentImpl::GetSelectionAsMarkup() {
const WebString& markup = local_frame->selectionAsMarkup();
if (!markup.isNull())
str = markup;
str = markup.utf16();
return str;
}
@ -156,7 +156,7 @@ CefString CefDOMDocumentImpl::GetSelectionAsText() {
const WebString& text = local_frame->selectionAsText();
if (!text.isNull())
str = text;
str = text.utf16();
return str;
}
@ -182,7 +182,7 @@ CefString CefDOMDocumentImpl::GetCompleteURL(const CefString& partialURL) {
return str;
const WebDocument& document = frame_->document();
const WebURL& url = document.completeURL(base::string16(partialURL));
const WebURL& url = document.completeURL(WebString::fromUTF16(partialURL));
if (!url.isNull()) {
GURL gurl = url;
str = gurl.spec();