Plugin Power Saver: Make PepperPluginInstanceThrottler interface public.

components/plugins/renderer/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 "components/plugins/renderer/plugin_placeholder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_piece.h"
@@ skipping 17 matching lines @@
 using base::UserMetricsAction;
 using blink::WebElement;
 using blink::WebLocalFrame;
 using blink::WebMouseEvent;
 using blink::WebNode;
 using blink::WebPlugin;
 using blink::WebPluginContainer;
 using blink::WebPluginParams;
 using blink::WebScriptSource;
 using blink::WebURLRequest;
+using content::PluginPowerSaverMode;
 using content::RenderThread;
 
 namespace plugins {
 
 gin::WrapperInfo PluginPlaceholder::kWrapperInfo = {gin::kEmbedderNativeGin};
 
 #if defined(ENABLE_PLUGINS)
 void PluginPlaceholder::BlockForPowerSaverPoster() {
   DCHECK(!is_blocked_for_power_saver_poster_);
   is_blocked_for_power_saver_poster_ = true;
@@ skipping 13 matching lines @@
     : content::RenderFrameObserver(render_frame),
       frame_(frame),
       plugin_params_(params),
       plugin_(WebViewPlugin::Create(this,
                                     render_frame->GetWebkitPreferences(),
                                     html_data,
                                     placeholderDataUrl)),
       is_blocked_for_background_tab_(false),
       is_blocked_for_prerendering_(false),
       is_blocked_for_power_saver_poster_(false),
-      power_saver_mode_(content::RenderFrame::POWER_SAVER_MODE_ESSENTIAL),
+      power_saver_mode_(PluginPowerSaverMode::POWER_SAVER_MODE_ESSENTIAL),
       allow_loading_(false),
       hidden_(false),
       finished_loading_(false),
       weak_factory_(this) {
 }
 
 PluginPlaceholder::~PluginPlaceholder() {}
 
 #if defined(ENABLE_PLUGINS)
 void PluginPlaceholder::DisablePowerSaverForInstance() {
-  power_saver_mode_ = content::RenderFrame::POWER_SAVER_MODE_ESSENTIAL;
+  power_saver_mode_ = PluginPowerSaverMode::POWER_SAVER_MODE_ESSENTIAL;
   if (is_blocked_for_power_saver_poster_) {
     is_blocked_for_power_saver_poster_ = false;
     if (!LoadingBlocked())
       LoadPlugin();
   }
 }
 #endif
 
 gin::ObjectTemplateBuilder PluginPlaceholder::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
@@ skipping 147 matching lines @@
   // event propagation changes between "close" vs. "click-to-play".
   if (hidden_)
     return;
   if (!plugin_)
     return;
   if (!allow_loading_) {
     NOTREACHED();
     return;
   }
 
+#if defined(ENABLE_PLUGINS)

[Lei Zhang, 2015/01/16 01:09:58]

Can you see if this works for platforms without ENABLE_PLUGINS? Same for
chrome_content_renderer_client.cc.

scoped_ptr<content::PluginInstanceThrottler> throttler;
#if defined(ENABLE_PLUGINS)
throttler = content::PluginInstanceThrottler::Get(...);
#endif
CreatePlugin(..., throttler.Pass());

[tommycli, 2015/01/16 01:26:10]

Done.

+  WebPlugin* plugin = render_frame()->CreatePlugin(
+      frame_, plugin_info_, plugin_params_,
+      content::PluginInstanceThrottler::Get(render_frame(), plugin_params_.url,
+                                            power_saver_mode_));
+#else
+  WebPlugin* plugin = render_frame()->CreatePlugin(frame_, plugin_info_,
+                                                   plugin_params_, nullptr);
+#endif
   // TODO(mmenke):  In the case of prerendering, feed into

[Lei Zhang, 2015/01/16 01:09:58]

Is this referring to the CreatePlugin() calls, which you have moved above the
comment?

[tommycli, 2015/01/16 01:26:10]

Done.

   //                ChromeContentRendererClient::CreatePlugin instead, to
   //                reduce the chance of future regressions.
-  WebPlugin* plugin = render_frame()->CreatePlugin(
-      frame_, plugin_info_, plugin_params_, power_saver_mode_);
   ReplacePlugin(plugin);
 }
 
 void PluginPlaceholder::LoadCallback() {
   RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Load_Click"));
 // If the user specifically clicks on the plug-in content's placeholder,
 // disable power saver throttling for this instance.
 #if defined(ENABLE_PLUGINS)
   DisablePowerSaverForInstance();
 #endif
@@ skipping 30 matching lines @@
   return plugin_params_;
 }
 
 bool PluginPlaceholder::LoadingBlocked() const {
   DCHECK(allow_loading_);
   return is_blocked_for_background_tab_ || is_blocked_for_power_saver_poster_ ||
          is_blocked_for_prerendering_;
 }
 
 }  // namespace plugins