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

content/renderer/pepper/plugin_power_saver_helper.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_power_saver_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 14 matching lines @@
 namespace {
 
 // Initial decision of the peripheral content decision.
 // These numeric values are used in UMA logs; do not change them.
 enum PeripheralHeuristicDecision {
   HEURISTIC_DECISION_PERIPHERAL = 0,
   HEURISTIC_DECISION_ESSENTIAL_SAME_ORIGIN = 1,
   HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_BIG = 2,
   HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_WHITELISTED = 3,
   HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_TINY = 4,
+  HEURISTIC_DECISION_ESSENTIAL_UNKNOWN_SIZE = 5,
   HEURISTIC_DECISION_NUM_ITEMS
 };
 
 const char kPeripheralHeuristicHistogram[] =
     "Plugin.PowerSaver.PeripheralHeuristic";
 
 // Plugin content below this size in height and width is considered "tiny".
 // Tiny content is never peripheral, as tiny plugins often serve a critical
 // purpose, and the user often cannot find and click to unthrottle it.
 const int kPeripheralContentTinySize = 5;
 
 void RecordDecisionMetric(PeripheralHeuristicDecision decision) {
   UMA_HISTOGRAM_ENUMERATION(kPeripheralHeuristicHistogram, decision,
                             HEURISTIC_DECISION_NUM_ITEMS);
 }
 
 }  // namespace
 
 PluginPowerSaverHelper::PeripheralPlugin::PeripheralPlugin(
-    const GURL& content_origin,
+    const url::Origin& content_origin,
     const base::Closure& unthrottle_callback)
     : content_origin(content_origin), unthrottle_callback(unthrottle_callback) {
 }
 
 PluginPowerSaverHelper::PeripheralPlugin::~PeripheralPlugin() {
 }
 
 PluginPowerSaverHelper::PluginPowerSaverHelper(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame)
     , override_for_testing_(Normal) {
@@ skipping 26 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PluginPowerSaverHelper, message)
   IPC_MESSAGE_HANDLER(FrameMsg_UpdatePluginContentOriginWhitelist,
                       OnUpdatePluginContentOriginWhitelist)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PluginPowerSaverHelper::OnUpdatePluginContentOriginWhitelist(
-    const std::set<GURL>& origin_whitelist) {
+    const std::set<url::Origin>& origin_whitelist) {
   origin_whitelist_ = origin_whitelist;
 
   // Check throttled plugin instances to see if any can be unthrottled.
   auto it = peripheral_plugins_.begin();
   while (it != peripheral_plugins_.end()) {
     if (origin_whitelist.count(it->content_origin)) {
       it->unthrottle_callback.Run();
       it = peripheral_plugins_.erase(it);
     } else {
       ++it;
     }
   }
 }
 
 void PluginPowerSaverHelper::RegisterPeripheralPlugin(
-    const GURL& content_origin,
+    const url::Origin& content_origin,
     const base::Closure& unthrottle_callback) {
-  DCHECK_EQ(content_origin.GetOrigin(), content_origin);
   peripheral_plugins_.push_back(
       PeripheralPlugin(content_origin, unthrottle_callback));
 }
 
 bool PluginPowerSaverHelper::ShouldThrottleContent(
-    const GURL& content_origin,
+    const url::Origin& content_origin,
     const std::string& plugin_module_name,
     int width,
     int height,
     bool* cross_origin_main_content) const {
-  DCHECK_EQ(content_origin.GetOrigin(), content_origin);
   if (cross_origin_main_content)
     *cross_origin_main_content = false;
 
   // This feature has only been tested throughly with Flash thus far.
   // It is also enabled for the Power Saver test plugin for browser tests.
   if (override_for_testing_ == Always) {
     return true;
   } else if (override_for_testing_ == Never) {
     return false;
   } else if (override_for_testing_ == Normal &&
              plugin_module_name != content::kFlashPluginName) {
     return false;
   }
 
-  if (width <= 0 || height <= 0)
-    return false;
-
-  // TODO(alexmos): Update this to use the origin of the RemoteFrame when 426512
-  // is fixed. For now, case 3 in the class level comment doesn't work in
-  // --site-per-process mode.
   blink::WebFrame* main_frame =
       render_frame()->GetWebFrame()->view()->mainFrame();
-  if (main_frame->isWebRemoteFrame()) {
-    RecordDecisionMetric(HEURISTIC_DECISION_PERIPHERAL);
-    return true;
+
+  url::Origin document_origin = main_frame->document().securityOrigin();

[alexmos, 2015/09/14 17:32:50]

You probably want to use main_frame->securityOrigin() directly, which will
redirect to replicated origins for remote frames.  Going through the document()
won't work for remote frames, since they have no document().

Also, main_frame_origin may be a better name for this.

[tommycli, 2015/09/14 20:23:56]

Done.

+  if (document_origin.IsSameOriginWith(content_origin)) {
+    RecordDecisionMetric(HEURISTIC_DECISION_ESSENTIAL_SAME_ORIGIN);
+    return false;
   }
 
-  // All same-origin plugin content is essential.
-  GURL main_frame_origin = GURL(main_frame->document().url()).GetOrigin();
-  if (content_origin == main_frame_origin) {
-    RecordDecisionMetric(HEURISTIC_DECISION_ESSENTIAL_SAME_ORIGIN);
+  if (width <= 0 || height <= 0) {
+    RecordDecisionMetric(HEURISTIC_DECISION_ESSENTIAL_UNKNOWN_SIZE);
     return false;
   }
 
   // Whitelisted plugin origins are also essential.
   if (origin_whitelist_.count(content_origin)) {
     RecordDecisionMetric(HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_WHITELISTED);
     return false;
   }
 
   // Never mark tiny content as peripheral.
   if (width <= kPeripheralContentTinySize &&
       height <= kPeripheralContentTinySize) {
     RecordDecisionMetric(HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_TINY);
     return false;
   }
 
   // Plugin content large in both dimensions are the "main attraction".
   if (PluginInstanceThrottler::IsLargeContent(width, height)) {
     RecordDecisionMetric(HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_BIG);
     if (cross_origin_main_content)
       *cross_origin_main_content = true;
     return false;
   }
 
   RecordDecisionMetric(HEURISTIC_DECISION_PERIPHERAL);
   return true;
 }
 
 void PluginPowerSaverHelper::WhitelistContentOrigin(
-    const GURL& content_origin) {
-  DCHECK_EQ(content_origin.GetOrigin(), content_origin);
+    const url::Origin& content_origin) {
   if (origin_whitelist_.insert(content_origin).second) {
     Send(new FrameHostMsg_PluginContentOriginAllowed(
         render_frame()->GetRoutingID(), content_origin));
   }
 }
 
 }  // namespace content