Plugin Power Saver: Implement pixel tests for plugin placeholders.

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"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "content/public/child/v8_value_converter.h"
-#include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
-#include "gin/handle.h"
-#include "gin/object_template_builder.h"
 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ skipping 149 matching lines @@
   }
   return v8::Local<v8::Object>();
 }
 
 void LoadablePluginPlaceholder::OnUnobscuredRectUpdate(
     const gfx::Rect& unobscured_rect) {
   DCHECK(content::RenderThread::Get());
   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_)
+  // Only update the unobscured rect during the recheck phase. Also early exit
+  // to prevent reentrancy issues.
+  if (in_size_recheck_) {
+    unobscured_rect_ = unobscured_rect;
     return;
+  }
 
   if (!size_update_timer_.IsRunning()) {
     // TODO(tommycli): We have to post a delayed task to recheck the size, as
     // Blink can report wrong sizes for partially obscured plugins while the
     // compositing state is dirty. https://crbug.com/343769
     size_update_timer_.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(kSizeChangeRecheckDelayMilliseconds),
         base::Bind(&LoadablePluginPlaceholder::RecheckSizeAndMaybeUnthrottle,
                    weak_factory_.GetWeakPtr()));
@@ skipping 59 matching lines @@
 
 void LoadablePluginPlaceholder::DidFinishLoadingCallback() {
   finished_loading_ = true;
   if (message_.length() > 0)
     UpdateMessage();
 
   // Wait for the placeholder to finish loading to hide the premade plugin.
   // This is necessary to prevent a flicker.
   if (premade_throttler_ && power_saver_enabled_)
     premade_throttler_->SetHiddenForPlaceholder(true /* hidden */);
+}
 
+void LoadablePluginPlaceholder::DidFinishIconRepositionForTestingCallback() {
   // Set an attribute and post an event, so browser tests can wait for the
   // placeholder to be ready to receive simulated user input.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnablePluginPlaceholderTesting)) {
-    blink::WebElement element = plugin()->container()->element();
-    element.setAttribute("placeholderLoaded", "true");
+  blink::WebElement element = plugin()->container()->element();
+  element.setAttribute("placeholderReady", "true");
 
-    scoped_ptr<content::V8ValueConverter> converter(
-        content::V8ValueConverter::create());
-    base::StringValue value("placeholderLoaded");
-    blink::WebSerializedScriptValue message_data =
-        blink::WebSerializedScriptValue::serialize(converter->ToV8Value(
-            &value, element.document().frame()->mainWorldScriptContext()));
-    blink::WebDOMMessageEvent msg_event(message_data);
-    element.dispatchEvent(msg_event);
-  }
+  scoped_ptr<content::V8ValueConverter> converter(
+      content::V8ValueConverter::create());
+  base::StringValue value("placeholderReady");
+  blink::WebSerializedScriptValue message_data =
+      blink::WebSerializedScriptValue::serialize(converter->ToV8Value(
+          &value, element.document().frame()->mainWorldScriptContext()));
+  blink::WebDOMMessageEvent msg_event(message_data);
+
+  element.dispatchEvent(msg_event);
 }
 
 void LoadablePluginPlaceholder::SetPluginInfo(
     const content::WebPluginInfo& plugin_info) {
   plugin_info_ = plugin_info;
 }
 
 const content::WebPluginInfo& LoadablePluginPlaceholder::GetPluginInfo() const {
   return plugin_info_;
 }
 
 void LoadablePluginPlaceholder::SetIdentifier(const std::string& identifier) {
   identifier_ = identifier;
 }
 
 const std::string& LoadablePluginPlaceholder::GetIdentifier() const {
   return identifier_;
 }
 
 bool LoadablePluginPlaceholder::LoadingBlocked() const {
   DCHECK(allow_loading_);
   return is_blocked_for_background_tab_ || is_blocked_for_power_saver_poster_ ||
          is_blocked_for_prerendering_;
 }
 
 void LoadablePluginPlaceholder::RecheckSizeAndMaybeUnthrottle() {
   DCHECK(content::RenderThread::Get());
   DCHECK(!in_size_recheck_);
+  DCHECK(finished_loading_);
 
   if (!plugin())
     return;
 
   in_size_recheck_ = true;
 
+  gfx::Rect old_rect = unobscured_rect_;
+
   // Re-check the size in case the reported size was incorrect.
   plugin()->container()->reportGeometry();
 
+  if (old_rect == unobscured_rect_) {
+    in_size_recheck_ = false;
+    return;
+  }
+
   float zoom_factor = plugin()->container()->pageZoomFactor();
   int width = roundf(unobscured_rect_.width() / zoom_factor);
   int height = roundf(unobscured_rect_.height() / zoom_factor);
 
   if (is_blocked_for_power_saver_poster_) {
     // Adjust poster container padding and dimensions to center play button for
     // plugins and plugin posters that have their top or left portions obscured.
     int x = roundf(unobscured_rect_.x() / zoom_factor);
     int y = roundf(unobscured_rect_.y() / zoom_factor);
     std::string script = base::StringPrintf(
@@ skipping 19 matching lines @@
         render_frame()->WhitelistContentOrigin(content_origin);
     }
 
     heuristic_run_before_ = true;
   }
 
   in_size_recheck_ = false;
 }
 
 }  // namespace plugins