Browser Plugin: Implement AutoSize

content/browser/browser_plugin/test_browser_plugin_guest.cc

 // Copyright (c) 2012 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/browser/browser_plugin/test_browser_plugin_guest.h"
 
 #include "base/test/test_timeouts.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
@@ skipping 52 matching lines @@
       return;
     }
   }
 
   BrowserPluginGuest::Observe(type, source, details);
 }
 
 void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
   if (msg->type() == BrowserPluginMsg_UpdateRect::ID) {
     update_rect_count_++;
+    int instance_id = 0;
+    int message_id = 0;
+    BrowserPluginMsg_UpdateRect_Params params;
+    BrowserPluginMsg_UpdateRect::Read(msg, &instance_id, &message_id, &params);
+    last_view_size_observed_ = params.view_size;
+    if (!auto_view_size_.IsEmpty() && auto_view_size_ == params.view_size) {
+      if (auto_view_size_message_loop_runner_)
+        auto_view_size_message_loop_runner_->Quit();

[lazyboy, 2012/11/07 07:39:09]

Running this line implies send_message_loop_runner_ == NULL, right? Is it
possible to DCHECK this? (I don't remember what happens when DCHECK fails in
tests).
I am suggesting this b/c more than one WaitForXXX is handled in this function
and this isn't like other simpler WaitXXXs in this class, doesn't hurt to be a
bit verbose.

[Fady Samuel, 2012/11/07 20:21:12]

I don't think that's quite true, we don't clear MessageLoopRunners when they
quit so if "WaitForUpdateRect" is called before "WaitForViewSize" this DCHECK
would fail. I suppose I could modify all the WaitFor* method to clear the
scoped_refptr after the MessageLoopRunner returns, but I'd prefer to do that in
a separate CL.

+    }
     if (send_message_loop_runner_)
       send_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::SendMessageToEmbedder(msg);
 }
 
 void TestBrowserPluginGuest::WaitForUpdateRectMsg() {
   // Check if we already got any UpdateRect message.
   if (update_rect_count_ > 0)
     return;
@@ skipping 108 matching lines @@
   if (load_stop_observed_) {
     load_stop_observed_ = false;
     return;
   }
 
   load_stop_message_loop_runner_ = new MessageLoopRunner();
   load_stop_message_loop_runner_->Run();
   load_stop_observed_ = false;
 }
 
+void TestBrowserPluginGuest::WaitForViewSize(const gfx::Size& view_size) {
+  if (last_view_size_observed_ == view_size) {
+    last_view_size_observed_ = gfx::Size();
+    return;
+  }
+
+  auto_view_size_ = view_size;
+  auto_view_size_message_loop_runner_ = new MessageLoopRunner();
+  auto_view_size_message_loop_runner_->Run();
+  last_view_size_observed_ = gfx::Size();
+}
+
 void TestBrowserPluginGuest::SetFocus(bool focused) {
   focus_observed_ = true;
   if (focus_message_loop_runner_)
     focus_message_loop_runner_->Quit();
   BrowserPluginGuest::SetFocus(focused);
 }
 
 bool TestBrowserPluginGuest::ViewTakeFocus(bool reverse) {
   advance_focus_observed_ = true;
   if (advance_focus_message_loop_runner_)
@@ skipping 43 matching lines @@
 
 void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);
   load_stop_observed_ = true;
   if (load_stop_message_loop_runner_)
     load_stop_message_loop_runner_->Quit();
 }
 
 }  // namespace content