Plugin Power Saver: Fix play-icon positioning when poster specified.

components/plugins/renderer/loadable_plugin_placeholder.cc

 // Copyright 2015 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/loadable_plugin_placeholder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/json/string_escape.h"
@@ skipping 166 matching lines @@
   // Pass through JavaScript access to the underlying throttled plugin.
   if (premade_throttler_ && premade_throttler_->GetWebPlugin()) {
     return premade_throttler_->GetWebPlugin()->v8ScriptableObject(isolate);
   }
   return v8::Local<v8::Object>();
 }
 
 void LoadablePluginPlaceholder::OnUnobscuredRectUpdate(
     const gfx::Rect& unobscured_rect) {
   DCHECK(content::RenderThread::Get());
-  if (!power_saver_enabled_ || !premade_throttler_ || !finished_loading_)
+  if (!power_saver_enabled_ || !finished_loading_)
     return;
 
   unobscured_rect_ = unobscured_rect;
 
   // During a size recheck, we will get another notification into this method.
   // Use this flag to early exit to prevent reentrancy issues.
   if (in_size_recheck_)
     return;
 
   if (!size_update_timer_.IsRunning()) {
@@ skipping 123 matching lines @@
   if (!plugin())
     return;
 
   in_size_recheck_ = true;
 
   // Re-check the size in case the reported size was incorrect.
   plugin()->container()->reportGeometry();
 
   float zoom_factor = plugin()->container()->pageZoomFactor();
 
-  // Adjust padding using clip coordinates to center play button for plugins
-  // that have their top or left portions obscured.
+  // Adjust poster container padding and dimensions to center play button for
+  // plugins and plugin posters that have their top or left portions obscured.
   if (is_blocked_for_power_saver_poster_) {
     int x = roundf(unobscured_rect_.x() / zoom_factor);
     int y = roundf(unobscured_rect_.y() / zoom_factor);
-    std::string script =
-        base::StringPrintf("window.setPosterMargin('%dpx', '%dpx')", x, y);
+    int width = roundf(unobscured_rect_.width() / zoom_factor);
+    int height = roundf(unobscured_rect_.height() / zoom_factor);
+    std::string script = base::StringPrintf(
+        "window.resizePoster('%dpx', '%dpx', '%dpx', '%dpx')", x, y, width,
+        height);
     plugin()->web_view()->mainFrame()->executeScript(
         blink::WebScriptSource(base::UTF8ToUTF16(script)));
   }
 
-  if (PluginInstanceThrottler::IsLargeContent(
+  // Only unthrottle on size increase for plugins without poster.
+  // TODO(tommycli): Address this unfairness to plugins that specify a poster.
+  if (premade_throttler_ &&

[tommycli, 2015/10/15 21:54:50]

Needed to compensate for change in line 187.

[Lei Zhang, 2015/10/15 23:05:31]

Sorry, it's been a while. You'll have to remind me why we need the line 187
change. Maybe in person.

[tommycli, 2015/10/16 17:16:25]

Discussed in person.

+      PluginInstanceThrottler::IsLargeContent(
           roundf(unobscured_rect_.width() / zoom_factor),
           roundf(unobscured_rect_.height() / zoom_factor))) {
     MarkPluginEssential(
         PluginInstanceThrottler::UNTHROTTLE_METHOD_BY_SIZE_CHANGE);
   }
 
   in_size_recheck_ = false;
 }
 
 }  // namespace plugins