Plugin Power Saver: Make PPS work well with prerendered pages.

content/renderer/pepper/plugin_instance_throttler_impl.cc

 // Copyright 2014 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 "content/renderer/pepper/plugin_instance_throttler_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
-#include "content/renderer/pepper/pepper_webplugin_impl.h"
 #include "content/renderer/render_frame_impl.h"
 #include "ppapi/shared_impl/ppapi_constants.h"
-#include "ppapi/shared_impl/scoped_pp_var.h"
-#include "ppapi/shared_impl/var.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "ui/gfx/color_utils.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 64 matching lines @@
 
 void PluginInstanceThrottlerImpl::MarkPluginEssential(
     PowerSaverUnthrottleMethod method) {
   if (state_ == THROTTLER_STATE_MARKED_ESSENTIAL)
     return;
 
   bool was_throttled = IsThrottled();
   state_ = THROTTLER_STATE_MARKED_ESSENTIAL;
   RecordUnthrottleMethodMetric(method);
 
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnPeripheralStateChange());
+
   if (was_throttled)
     FOR_EACH_OBSERVER(Observer, observer_list_, OnThrottleStateChange());
-
-  // Notify the Power Saver test plugin of a peripheral status change.
-  if (web_plugin_ && web_plugin_->instance() &&
-      plugin_module_name_ == ppapi::kPowerSaverTestPluginName) {
-    web_plugin_->instance()->HandleMessage(ppapi::ScopedPPVar(
-        ppapi::ScopedPPVar::PassRef(),
-        ppapi::StringVar::StringToPPVar("peripheralStatusChange")));
-  }
 }
 
 void PluginInstanceThrottlerImpl::SetHiddenForPlaceholder(bool hidden) {
   is_hidden_for_placeholder_ = hidden;
   FOR_EACH_OBSERVER(Observer, observer_list_, OnHiddenForPlaceholder(hidden));
 }
 
-blink::WebPlugin* PluginInstanceThrottlerImpl::GetWebPlugin() const {
+PepperWebPluginImpl* PluginInstanceThrottlerImpl::GetWebPlugin() const {
   DCHECK(web_plugin_);
   return web_plugin_;
 }
 
 const gfx::Size& PluginInstanceThrottlerImpl::GetSize() const {
   return unobscured_size_;
 }
 
 void PluginInstanceThrottlerImpl::NotifyAudioThrottled() {
   audio_throttled_ = true;
   audio_throttled_frame_timeout_.Reset();
 }
 
 void PluginInstanceThrottlerImpl::SetWebPlugin(
     PepperWebPluginImpl* web_plugin) {
   DCHECK(!web_plugin_);
   web_plugin_ = web_plugin;
 }
 
 void PluginInstanceThrottlerImpl::Initialize(
     RenderFrameImpl* frame,
     const GURL& content_origin,
     const std::string& plugin_module_name,
     const gfx::Size& unobscured_size) {
-  plugin_module_name_ = plugin_module_name;
+  DCHECK(unobscured_size_.IsEmpty());
   unobscured_size_ = unobscured_size;
 
   // |frame| may be nullptr in tests.
   if (frame) {
     PluginPowerSaverHelper* helper = frame->plugin_power_saver_helper();
     bool cross_origin_main_content = false;
     if (!helper->ShouldThrottleContent(content_origin, plugin_module_name,
                                        unobscured_size.width(),
                                        unobscured_size.height(),
                                        &cross_origin_main_content)) {
+      DCHECK_NE(THROTTLER_STATE_MARKED_ESSENTIAL, state_);
       state_ = THROTTLER_STATE_MARKED_ESSENTIAL;
+      FOR_EACH_OBSERVER(Observer, observer_list_, OnPeripheralStateChange());
 
       if (cross_origin_main_content)
         helper->WhitelistContentOrigin(content_origin);
 
       return;
     }
 
     // To collect UMAs, register peripheral content even if power saver mode
     // is disabled.
     helper->RegisterPeripheralPlugin(
@@ skipping 53 matching lines @@
 
     // Release our reference to the underlying pixel data.
     last_received_frame_.reset();
   }
 
   state_ = THROTTLER_STATE_PLUGIN_THROTTLED;
   FOR_EACH_OBSERVER(Observer, observer_list_, OnThrottleStateChange());
 }
 
 }  // namespace content