Plugin Power Saver: Improve blocked tiny plugins behavior

chrome/renderer/plugins/chrome_plugin_placeholder.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 47 matching lines @@
     const blink::WebPluginParams& params,
     const std::string& html_data,
     const base::string16& title)
     : plugins::LoadablePluginPlaceholder(render_frame,
                                          frame,
                                          params,
                                          html_data),
       status_(ChromeViewHostMsg_GetPluginInfo_Status::kAllowed),
       title_(title),
       context_menu_request_id_(0),
-      ignore_updates_(false) {
+      did_send_blocked_content_notification_(false) {
   RenderThread::Get()->AddObserver(this);
 }
 
 ChromePluginPlaceholder::~ChromePluginPlaceholder() {
   RenderThread::Get()->RemoveObserver(this);
   if (context_menu_request_id_ && render_frame())
     render_frame()->CancelContextMenu(context_menu_request_id_);
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   if (placeholder_routing_id_ == MSG_ROUTING_NONE)
@@ skipping 84 matching lines @@
   blocked_plugin->SetPluginInfo(info);
   blocked_plugin->SetIdentifier(identifier);
 
   blocked_plugin->set_power_saver_enabled(power_saver_info.power_saver_enabled);
   blocked_plugin->set_blocked_for_background_tab(
       power_saver_info.blocked_for_background_tab);
 
   return blocked_plugin;
 }
 
-// static
-ChromePluginPlaceholder* ChromePluginPlaceholder::CreateDelayedPlugin(
-    content::RenderFrame* render_frame,
-    blink::WebLocalFrame* frame,
-    const blink::WebPluginParams& params,
-    const content::WebPluginInfo& info,
-    const std::string& identifier,
-    const base::string16& name,
-    const PowerSaverInfo& power_saver_info) {
-  // Can never be called with an actual poster.
-  DCHECK(power_saver_info.poster_attribute.empty());
-
-  // Can never be called when blocked for background tab.
-  DCHECK(!power_saver_info.blocked_for_background_tab);
-
-  const base::StringPiece template_html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_PLUGIN_DELAY_HTML));
-  base::DictionaryValue values;
-  std::string html_data = webui::GetI18nTemplateHtml(template_html, &values);
-
-  // |delay_plugin| will destroy itself when its WebViewPlugin is going away.
-  ChromePluginPlaceholder* delay_plugin =
-      new ChromePluginPlaceholder(render_frame, frame, params, html_data, name);
-
-  delay_plugin->set_delayed(true);
-  delay_plugin->SetPluginInfo(info);
-  delay_plugin->SetIdentifier(identifier);
-  delay_plugin->set_power_saver_enabled(power_saver_info.power_saver_enabled);
-
-  return delay_plugin;
-}
-
 void ChromePluginPlaceholder::SetStatus(
     ChromeViewHostMsg_GetPluginInfo_Status status) {
   status_ = status;
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 int32_t ChromePluginPlaceholder::CreateRoutingId() {
   placeholder_routing_id_ = RenderThread::Get()->GenerateRoutingID();
   RenderThread::Get()->AddRoute(placeholder_routing_id_, this);
   return placeholder_routing_id_;
@@ skipping 185 matching lines @@
     // PluginPreroller manages its own lifetime.
     new PluginPreroller(render_frame(), GetFrame(), GetPluginParams(),
                         GetPluginInfo(), GetIdentifier(), title_,
                         l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, title_),
                         throttler.get());
   }
   return render_frame()->CreatePlugin(GetFrame(), GetPluginInfo(),
                                       GetPluginParams(), std::move(throttler));
 }
 
-void ChromePluginPlaceholder::OnLoadedRectUpdate(
-    const gfx::Rect& unobscured_rect,
-    content::RenderFrame::PeripheralContentStatus status) {
-  // If the placeholder is in the blocked state, do nothing.
-  if (ignore_updates_)
+void ChromePluginPlaceholder::OnBlockedTinyContent() {
+  if (did_send_blocked_content_notification_)
     return;
 
-  // This should only be called once.
-  set_delayed(false);
-
-  // block tiny cross-origin - simply by not continuing the load chain.
-  if (status ==
-      content::RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_TINY) {
-    ContentSettingsObserver* observer =
-        ContentSettingsObserver::Get(render_frame());
-    observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, title_);
-    AllowLoading();
-    ignore_updates_ = true;
-    return;
-  }
-
-  // For essential content, powersaver can be turned off.
-  if (status != content::RenderFrame::CONTENT_STATUS_PERIPHERAL)
-    set_power_saver_enabled(false);
-
-  AllowLoading();
-  LoadPlugin();
+  did_send_blocked_content_notification_ = true;
+  ContentSettingsObserver::Get(render_frame())
+      ->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, title_);
 }
 
 gin::ObjectTemplateBuilder ChromePluginPlaceholder::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
   gin::ObjectTemplateBuilder builder =
       gin::Wrappable<ChromePluginPlaceholder>::GetObjectTemplateBuilder(isolate)
           .SetMethod<void (ChromePluginPlaceholder::*)()>(
               "hide", &ChromePluginPlaceholder::HideCallback)
           .SetMethod<void (ChromePluginPlaceholder::*)()>(
               "load", &ChromePluginPlaceholder::LoadCallback)
           .SetMethod<void (ChromePluginPlaceholder::*)()>(
               "didFinishLoading",
               &ChromePluginPlaceholder::DidFinishLoadingCallback)
           .SetMethod("openAboutPlugins",
                      &ChromePluginPlaceholder::OpenAboutPluginsCallback);
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePluginPlaceholderTesting)) {
     builder.SetMethod<void (ChromePluginPlaceholder::*)()>(
         "didFinishIconRepositionForTesting",
         &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback);
   }
 
   return builder;
 }