Plugin Power Saver: Improve origin handling esp. with OOPIF.

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 <cmath>
 
 #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/render_frame_impl.h"
 #include "ppapi/shared_impl/ppapi_constants.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
+#include "third_party/WebKit/public/web/WebView.h"
 #include "ui/gfx/color_utils.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 namespace content {
 
 namespace {
 
 // Cross-origin plugin content must have a width and height both exceeding
 // these minimums to be considered "large", and thus not peripheral.
 const int kLargeContentMinWidth = 398;
 const int kLargeContentMinHeight = 298;
 
@@ skipping 119 matching lines @@
 }
 
 void PluginInstanceThrottlerImpl::SetWebPlugin(
     PepperWebPluginImpl* web_plugin) {
   DCHECK(!web_plugin_);
   web_plugin_ = web_plugin;
 }
 
 void PluginInstanceThrottlerImpl::Initialize(
     RenderFrameImpl* frame,
-    const GURL& content_origin,
+    const url::Origin& content_origin,
     const std::string& plugin_module_name,
     const gfx::Size& unobscured_size) {
   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;
     float zoom_factor = GetWebPlugin()->container()->pageZoomFactor();
     if (!helper->ShouldThrottleContent(
+            frame->GetWebFrame()->view()->mainFrame()->securityOrigin(),

[piman, 2015/09/14 23:58:23]

Should this be frame->GetWebFrame()->top()->securityOrigin() ?

[tommycli, 2015/09/15 00:38:19]

Done. I think this should be equivalent.

             content_origin, plugin_module_name,
             roundf(unobscured_size.width() / zoom_factor),
             roundf(unobscured_size.height() / zoom_factor),
             &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);
@@ skipping 60 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