Remove SW rendering path code from BrowserPlugin.

content/renderer/browser_plugin/browser_plugin_browsertest.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/renderer/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
@@ skipping 174 matching lines @@
   MockBrowserPlugin* browser_plugin = static_cast<MockBrowserPlugin*>(
       browser_plugin_manager()->GetBrowserPlugin(instance_id));
 
   BrowserPluginMsg_Attach_ACK_Params attach_ack_params;
   browser_plugin->OnAttachACK(instance_id, attach_ack_params);
 
   return browser_plugin;
 }
 
 // This test verifies that an initial resize occurs when we instantiate the
-// browser plugin. This test also verifies that the browser plugin is waiting
-// for a BrowserPluginMsg_UpdateRect in response. We issue an UpdateRect, and
-// we observe an UpdateRect_ACK, with the |pending_damage_buffer_| reset,
-// indiciating that the BrowserPlugin is not waiting for any more UpdateRects to
-// satisfy its resize request.
+// browser plugin.
 TEST_F(BrowserPluginTest, InitialResize) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   // Verify that the information in Attach is correct.
   BrowserPluginHostMsg_Attach_Params params;
   MockBrowserPlugin* browser_plugin = GetCurrentPluginWithAttachParams(&params);
 
   EXPECT_EQ(640, params.resize_guest_params.view_rect.width());
   EXPECT_EQ(480, params.resize_guest_params.view_rect.height());
   ASSERT_TRUE(browser_plugin);
-  // Now the browser plugin is expecting a UpdateRect resize.
-  int instance_id = browser_plugin->guest_instance_id();
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
-
-  // Send the BrowserPlugin an UpdateRect equal to its container size with
-  // the same damage buffer. That should clear |pending_damage_buffer_|.
-  BrowserPluginMsg_UpdateRect_Params update_rect_params;
-  update_rect_params.damage_buffer_sequence_id =
-      browser_plugin->damage_buffer_sequence_id_;
-  update_rect_params.view_size = gfx::Size(640, 480);
-  update_rect_params.scale_factor = 1.0f;
-  update_rect_params.is_resize_ack = true;
-  update_rect_params.needs_ack = true;
-  BrowserPluginMsg_UpdateRect msg(instance_id, update_rect_params);
-  browser_plugin->OnMessageReceived(msg);
-  EXPECT_FALSE(browser_plugin->pending_damage_buffer_.get());
 }
 
 // This test verifies that all attributes (present at the time of writing) are
 // parsed on initialization. However, this test does minimal checking of
 // correct behavior.
 TEST_F(BrowserPluginTest, ParseAllAttributes) {
   std::string html = base::StringPrintf(kHTMLForBrowserPluginWithAllAttributes,
                                         kBrowserPluginMimeType);
   LoadHTML(html.c_str());
   bool result;
@@ skipping 63 matching lines @@
             "document.getElementById('browserplugin').src");
     EXPECT_EQ("bar", src_value);
   }
 }
 
 TEST_F(BrowserPluginTest, ResizeFlowControl) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   MockBrowserPlugin* browser_plugin = GetCurrentPlugin();
   ASSERT_TRUE(browser_plugin);
   int instance_id = browser_plugin->guest_instance_id();
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
-  // Send an UpdateRect to the BrowserPlugin to make it use the pending damage
-  // buffer.
+  // Send an UpdateRect to the BrowserPlugin to make sure the browser sees a
+  // resize related (SetAutoSize) message.
   {
     // We send a stale UpdateRect to the BrowserPlugin.
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(640, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
-    update_rect_params.needs_ack = true;
-    // By sending |damage_buffer_sequence_id| back to BrowserPlugin on
-    // UpdateRect, then the BrowserPlugin knows that the browser process has
-    // received and has begun to use the |pending_damage_buffer_|.
-    update_rect_params.damage_buffer_sequence_id =
-        browser_plugin->damage_buffer_sequence_id_;
     BrowserPluginMsg_UpdateRect msg(instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
-    EXPECT_EQ(NULL, browser_plugin->pending_damage_buffer_.get());
   }
 
   browser_plugin_manager()->sink().ClearMessages();
 
   // Resize the browser plugin three times.
 
   ExecuteJavaScript("document.getElementById('browserplugin').width = '641px'");
   GetMainFrame()->view()->layout();
   ProcessPendingMessages();
 
@@ skipping 17 matching lines @@
       EXPECT_EQ(msg->type(), BrowserPluginHostMsg_UpdateGeometry::ID);
   }
   const IPC::Message* msg =
       browser_plugin_manager()->sink().GetUniqueMessageMatching(
           BrowserPluginHostMsg_ResizeGuest::ID);
   ASSERT_TRUE(msg);
   BrowserPluginHostMsg_ResizeGuest_Params params;
   BrowserPluginHostMsg_ResizeGuest::Read(msg, &instance_id, &params);
   EXPECT_EQ(641, params.view_rect.width());
   EXPECT_EQ(480, params.view_rect.height());
-  // This indicates that the BrowserPlugin has sent out a previous resize
-  // request but has not yet received an UpdateRect for that request.
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
 
   {
     // We send a stale UpdateRect to the BrowserPlugin.
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(641, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
-    update_rect_params.needs_ack = true;
-    update_rect_params.damage_buffer_sequence_id =
-        browser_plugin->damage_buffer_sequence_id_;
     BrowserPluginMsg_UpdateRect msg(instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
-    // This tells us that the BrowserPlugin is still expecting another
-    // UpdateRect with the most recent size.
-    EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
   }
   // Send the BrowserPlugin another UpdateRect, but this time with a size
   // that matches the size of the container.
   {
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(643, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
-    update_rect_params.needs_ack = true;
-    update_rect_params.damage_buffer_sequence_id =
-        browser_plugin->damage_buffer_sequence_id_;
     BrowserPluginMsg_UpdateRect msg(instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
-    // The BrowserPlugin has finally received an UpdateRect that satisifes
-    // its current size, and so it is happy.
-    EXPECT_FALSE(browser_plugin->pending_damage_buffer_.get());
   }
 }
 
 TEST_F(BrowserPluginTest, RemovePlugin) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   EXPECT_FALSE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_PluginDestroyed::ID));
   ExecuteJavaScript("x = document.getElementById('browserplugin'); "
                     "x.parentNode.removeChild(x);");
   ProcessPendingMessages();
@@ skipping 180 matching lines @@
   MockBrowserPlugin* browser_plugin =
       GetCurrentPluginWithAttachParams(&params);
   ASSERT_TRUE(browser_plugin);
 
   EXPECT_TRUE(params.auto_size_params.enable);
   EXPECT_EQ(42, params.auto_size_params.min_size.width());
   EXPECT_EQ(43, params.auto_size_params.min_size.height());
   EXPECT_EQ(1337, params.auto_size_params.max_size.width());
   EXPECT_EQ(1338, params.auto_size_params.max_size.height());
 
-  // Verify that we are waiting for the browser process to grab the new
-  // damage buffer.
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
   // Disable autosize. AutoSize state will not be sent to the guest until
   // the guest has responded to the last resize request.
   ExecuteJavaScript(kDisableAutoSize);
   ProcessPendingMessages();
 
   const IPC::Message* auto_size_msg =
   browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_SetAutoSize::ID);
   EXPECT_FALSE(auto_size_msg);
 
-  // Send the BrowserPlugin an UpdateRect equal to its |max_size| with
-  // the same damage buffer.
+  // Send the BrowserPlugin an UpdateRect equal to its |max_size|.
   BrowserPluginMsg_UpdateRect_Params update_rect_params;
-  update_rect_params.damage_buffer_sequence_id =
-      browser_plugin->damage_buffer_sequence_id_;
   update_rect_params.view_size = gfx::Size(1337, 1338);
   update_rect_params.scale_factor = 1.0f;
   update_rect_params.is_resize_ack = true;
-  update_rect_params.needs_ack = true;
   BrowserPluginMsg_UpdateRect msg(instance_id, update_rect_params);
   browser_plugin->OnMessageReceived(msg);
 
   // Verify that the autosize state has been updated.
   {
     const IPC::Message* auto_size_msg =
-    browser_plugin_manager()->sink().GetUniqueMessageMatching(
-        BrowserPluginHostMsg_UpdateRect_ACK::ID);
+        browser_plugin_manager()->sink().GetUniqueMessageMatching(
+            BrowserPluginHostMsg_SetAutoSize::ID);
     ASSERT_TRUE(auto_size_msg);
 
     int instance_id = 0;
     BrowserPluginHostMsg_AutoSize_Params auto_size_params;
     BrowserPluginHostMsg_ResizeGuest_Params resize_params;
-    BrowserPluginHostMsg_UpdateRect_ACK::Read(auto_size_msg,
-                                              &instance_id,
-                                              &auto_size_params,
-                                              &resize_params);
+    BrowserPluginHostMsg_SetAutoSize::Read(auto_size_msg,
+                                           &instance_id,
+                                           &auto_size_params,
+                                           &resize_params);
     EXPECT_FALSE(auto_size_params.enable);
     // These value are not populated (as an optimization) if autosize is
     // disabled.
     EXPECT_EQ(0, auto_size_params.min_size.width());
     EXPECT_EQ(0, auto_size_params.min_size.height());
     EXPECT_EQ(0, auto_size_params.max_size.width());
     EXPECT_EQ(0, auto_size_params.max_size.height());
   }
 }
 
 }  // namespace content