Update to Chromium revision 318e6f54 (#400326)

This commit is contained in:
Marshall Greenblatt
2016-06-20 18:59:23 -04:00
parent 66425def4a
commit 05ee60b7b4
78 changed files with 679 additions and 442 deletions

View File

@@ -58,7 +58,6 @@ CefPluginPlaceholder::CefPluginPlaceholder(
html_data),
status_(CefViewHostMsg_GetPluginInfo_Status::kAllowed),
title_(title),
has_host_(false),
context_menu_request_id_(0),
ignore_updates_(false) {
RenderThread::Get()->AddObserver(this);

View File

@@ -82,7 +82,6 @@ class CefPluginPlaceholder final
base::string16 title_;
bool has_host_;
int context_menu_request_id_; // Nonzero when request pending.
base::string16 plugin_name_;

View File

@@ -91,3 +91,7 @@ void CefPluginPreroller::OnThrottlerDestroyed() {
throttler_ = nullptr;
delete this;
}
void CefPluginPreroller::OnDestruct() {
delete this;
}

View File

@@ -44,6 +44,9 @@ class CefPluginPreroller : public content::PluginInstanceThrottler::Observer,
void OnThrottleStateChange() override;
void OnThrottlerDestroyed() override;
// content::RenderFrameObserver implementation.
void OnDestruct() override;
blink::WebLocalFrame* frame_;
blink::WebPluginParams params_;
content::WebPluginInfo info_;