Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / browser_plugin / test_browser_plugin_guest.cc

diff --git a/src/content/browser/browser_plugin/test_browser_plugin_guest.cc b/src/content/browser/browser_plugin/test_browser_plugin_guest.cc
index 91ba290..ea51e91 100644 (file)
--- a/src/content/browser/browser_plugin/test_browser_plugin_guest.cc
+++ b/src/content/browser/browser_plugin/test_browser_plugin_guest.cc
@@ -16,20 +16,15 @@ class BrowserPluginGuest;
 TestBrowserPluginGuest::TestBrowserPluginGuest(
     int instance_id,
     WebContentsImpl* web_contents)
-    : BrowserPluginGuest(instance_id, false, web_contents, NULL),
+    : BrowserPluginGuest(instance_id, false, web_contents),
       update_rect_count_(0),
-      damage_buffer_call_count_(0),
       exit_observed_(false),
       focus_observed_(false),
       blur_observed_(false),
       advance_focus_observed_(false),
-      was_hidden_observed_(false),
-      set_damage_buffer_observed_(false),
       input_observed_(false),
       load_stop_observed_(false),
-      ime_cancel_observed_(false),
-      waiting_for_damage_buffer_with_size_(false),
-      last_damage_buffer_size_(gfx::Size()) {
+      ime_cancel_observed_(false) {
 }
 
 TestBrowserPluginGuest::~TestBrowserPluginGuest() {
@@ -48,10 +43,10 @@ void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
     last_view_size_observed_ = params.view_size;
     if (!expected_auto_view_size_.IsEmpty() &&
         expected_auto_view_size_ == params.view_size) {
-      if (auto_view_size_message_loop_runner_.get())
+      if (auto_view_size_message_loop_runner_)
         auto_view_size_message_loop_runner_->Quit();
     }
-    if (send_message_loop_runner_.get())
+    if (send_message_loop_runner_)
       send_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::SendMessageToEmbedder(msg);
@@ -69,23 +64,12 @@ void TestBrowserPluginGuest::ResetUpdateRectCount() {
   update_rect_count_ = 0;
 }
 
-void TestBrowserPluginGuest::WaitForDamageBufferWithSize(
-    const gfx::Size& size) {
-  if (damage_buffer_call_count_ > 0 && last_damage_buffer_size_ == size)
-    return;
-
-  expected_damage_buffer_size_ = size;
-  waiting_for_damage_buffer_with_size_ = true;
-  damage_buffer_message_loop_runner_ = new MessageLoopRunner();
-  damage_buffer_message_loop_runner_->Run();
-}
-
 void TestBrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) {
   exit_observed_ = true;
   if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION &&
       status != base::TERMINATION_STATUS_STILL_RUNNING)
     VLOG(0) << "Guest crashed status: " << status;
-  if (crash_message_loop_runner_.get())
+  if (crash_message_loop_runner_)
     crash_message_loop_runner_->Quit();
   BrowserPluginGuest::RenderProcessGone(status);
 }
@@ -98,7 +82,7 @@ void TestBrowserPluginGuest::OnHandleInputEvent(
                                          guest_window_rect,
                                          event);
   input_observed_ = true;
-  if (input_message_loop_runner_.get())
+  if (input_message_loop_runner_)
     input_message_loop_runner_->Quit();
 }
 
@@ -138,16 +122,6 @@ void TestBrowserPluginGuest::WaitForAdvanceFocus() {
   advance_focus_message_loop_runner_->Run();
 }
 
-void TestBrowserPluginGuest::WaitUntilHidden() {
-  if (was_hidden_observed_) {
-    was_hidden_observed_ = false;
-    return;
-  }
-  was_hidden_message_loop_runner_ = new MessageLoopRunner();
-  was_hidden_message_loop_runner_->Run();
-  was_hidden_observed_ = false;
-}
-
 void TestBrowserPluginGuest::WaitForInput() {
   if (input_observed_) {
     input_observed_ = false;
@@ -193,14 +167,26 @@ void TestBrowserPluginGuest::WaitForImeCancel() {
   ime_cancel_observed_ = false;
 }
 
+void TestBrowserPluginGuest::WaitForResizeGuest(const gfx::Size& view_size) {
+  if (last_size_observed_in_resize_ == view_size) {
+    last_size_observed_in_resize_ = gfx::Size();
+    return;
+  }
+
+  expected_view_size_in_resize_ = view_size;
+  resize_guest_message_loop_runner_ = new MessageLoopRunner();
+  resize_guest_message_loop_runner_->Run();
+  last_size_observed_in_resize_ = gfx::Size();
+}
+
 void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
   if (focused) {
     focus_observed_ = true;
-    if (focus_message_loop_runner_.get())
+    if (focus_message_loop_runner_)
       focus_message_loop_runner_->Quit();
   } else {
     blur_observed_ = true;
-    if (blur_message_loop_runner_.get())
+    if (blur_message_loop_runner_)
       blur_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::OnSetFocus(instance_id, focused);
@@ -208,47 +194,38 @@ void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
 
 void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
   advance_focus_observed_ = true;
-  if (advance_focus_message_loop_runner_.get())
+  if (advance_focus_message_loop_runner_)
     advance_focus_message_loop_runner_->Quit();
   BrowserPluginGuest::OnTakeFocus(reverse);
 }
 
-void TestBrowserPluginGuest::SetDamageBuffer(
-    const BrowserPluginHostMsg_ResizeGuest_Params& params) {
-  ++damage_buffer_call_count_;
-  last_damage_buffer_size_ = params.view_rect.size();
-
-  if (waiting_for_damage_buffer_with_size_ &&
-      expected_damage_buffer_size_ == params.view_rect.size() &&
-      damage_buffer_message_loop_runner_.get()) {
-    damage_buffer_message_loop_runner_->Quit();
-    waiting_for_damage_buffer_with_size_ = false;
-  }
-
-  BrowserPluginGuest::SetDamageBuffer(params);
-}
-
 void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);
   load_stop_observed_ = true;
-  if (load_stop_message_loop_runner_.get())
+  if (load_stop_message_loop_runner_)
     load_stop_message_loop_runner_->Quit();
 }
 
 void TestBrowserPluginGuest::OnImeCancelComposition() {
   if (!ime_cancel_observed_) {
     ime_cancel_observed_ = true;
-    if (ime_cancel_message_loop_runner_.get())
+    if (ime_cancel_message_loop_runner_)
       ime_cancel_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::OnImeCancelComposition();
 }
 
-void TestBrowserPluginGuest::WasHidden() {
-  was_hidden_observed_ = true;
-  if (was_hidden_message_loop_runner_.get())
-    was_hidden_message_loop_runner_->Quit();
+void TestBrowserPluginGuest::OnResizeGuest(
+    int instance_id,
+    const BrowserPluginHostMsg_ResizeGuest_Params& params) {
+  last_size_observed_in_resize_ = params.view_rect.size();
+  if (last_size_observed_in_resize_ == expected_view_size_in_resize_ &&
+      resize_guest_message_loop_runner_) {
+    resize_guest_message_loop_runner_->Quit();
+  }
+
+  BrowserPluginGuest::OnResizeGuest(instance_id, params);
 }
 
 }  // namespace content