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

Remove CefFrame::LoadString method (fixes issue #2586)

Browse Source 
This method has not behaved as expected for some time.
This commit is contained in:
Marshall Greenblatt
2019-10-15 17:34:13 +02:00
parent d28efe8797
commit 737ff18498
11 changed files with 107 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libcef/renderer/frame_impl.cc
View File

@@ -153,17 +153,6 @@ void CefFrameImpl::LoadURL(const CefString& url) {
OnLoadRequest(params);
}
void CefFrameImpl::LoadString(const CefString& string, const CefString& url) {
CEF_REQUIRE_RT_RETURN_VOID();
if (frame_) {
GURL gurl = GURL(url.ToString());
content::RenderFrame::FromWebFrame(frame_)->LoadHTMLString(
string.ToString(), gurl, "UTF-8", GURL(),
false /* replace_current_item */);
}
}
void CefFrameImpl::ExecuteJavaScript(const CefString& jsCode,
const CefString& scriptUrl,
int startLine) {
@@ -481,17 +470,6 @@ void CefFrameImpl::OnRequest(const Cef_Request_Params& params) {
} else if (frame_->ExecuteCommand(blink::WebString::FromUTF8(command))) {
success = true;
}
} else if (params.name == "load-string") {
// Load a string.
DCHECK_EQ(params.arguments.GetSize(), (size_t)2);
std::string string, url;
params.arguments.GetString(0, &string);
params.arguments.GetString(1, &url);
content::RenderFrame::FromWebFrame(frame_)->LoadHTMLString(
string, GURL(url), "UTF-8", GURL(), false /* replace_current_item */);
} else {
// Invalid request.
NOTREACHED();