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 fa6a5d87 (#499098)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-09-06 17:40:58 -04:00
parent 22d2fc50d1
commit a028976ac4
122 changed files with 983 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/renderer/plugins/cef_plugin_placeholder.cc
View File

@@ -54,8 +54,7 @@ CefPluginPlaceholder::CefPluginPlaceholder(content::RenderFrame* render_frame,
: plugins::LoadablePluginPlaceholder(render_frame, params, html_data),
status_(CefViewHostMsg_GetPluginInfo_Status::kAllowed),
title_(title),
context_menu_request_id_(0),
did_send_blocked_content_notification_(false) {
context_menu_request_id_(0) {
RenderThread::Get()->AddObserver(this);
}
@@ -283,11 +282,10 @@ blink::WebPlugin* CefPluginPlaceholder::CreatePlugin() {
std::move(throttler));
}
void CefPluginPlaceholder::OnBlockedTinyContent() {
void CefPluginPlaceholder::OnBlockedContent(
content::RenderFrame::PeripheralContentStatus status,
bool is_same_origin) {
DCHECK(render_frame());
if (did_send_blocked_content_notification_)
return;
did_send_blocked_content_notification_ = true;
}
gin::ObjectTemplateBuilder CefPluginPlaceholder::GetObjectTemplateBuilder(

5
libcef/renderer/plugins/cef_plugin_placeholder.h
View File

@@ -48,7 +48,8 @@ class CefPluginPlaceholder final : public plugins::LoadablePluginPlaceholder,
// content::LoadablePluginPlaceholder overrides:
blink::WebPlugin* CreatePlugin() override;
void OnBlockedTinyContent() override;
void OnBlockedContent(content::RenderFrame::PeripheralContentStatus status,
bool is_same_origin) override;
// gin::Wrappable (via PluginPlaceholder) method
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
@@ -78,8 +79,6 @@ class CefPluginPlaceholder final : public plugins::LoadablePluginPlaceholder,
int context_menu_request_id_; // Nonzero when request pending.
base::string16 plugin_name_;
bool did_send_blocked_content_notification_;
DISALLOW_COPY_AND_ASSIGN(CefPluginPlaceholder);
};