Revert 278728 "[PPAPI] Add browser tests for compositor API"

trunk/src/content/renderer/pepper/pepper_plugin_instance_impl.cc

Index: trunk/src/content/renderer/pepper/pepper_plugin_instance_impl.cc
===================================================================
--- trunk/src/content/renderer/pepper/pepper_plugin_instance_impl.cc	(revision 278764)
+++ trunk/src/content/renderer/pepper/pepper_plugin_instance_impl.cc	(working copy)
@@ -1877,7 +1877,7 @@
     return;
   }
 
-  UpdateLayer(false);
+  UpdateLayer();
 
   bool old_plugin_focus = PluginHasFocus();
   flash_fullscreen_ = flash_fullscreen;
@@ -2016,7 +2016,7 @@
 #endif
 }
 
-void PepperPluginInstanceImpl::UpdateLayer(bool device_changed) {
+void PepperPluginInstanceImpl::UpdateLayer() {
   if (!container_)
     return;
 
@@ -2031,8 +2031,7 @@
   bool want_texture_layer = want_3d_layer || want_2d_layer;
   bool want_compositor_layer = !!bound_compositor_;
 
-  if (!device_changed &&
-      (want_texture_layer == !!texture_layer_.get()) &&
+  if ((want_texture_layer == !!texture_layer_.get()) &&
       (want_3d_layer == layer_is_hardware_) &&
       (want_compositor_layer == !!compositor_layer_) &&
       layer_bound_to_fullscreen_ == !!fullscreen_container_) {
@@ -2273,7 +2272,7 @@
 
   // Special-case clearing the current device.
   if (!device) {
-    UpdateLayer(true);
+    UpdateLayer();
     InvalidateRect(gfx::Rect());
     return PP_TRUE;
   }
@@ -2309,13 +2308,13 @@
   if (compositor) {
     if (compositor->BindToInstance(this)) {
       bound_compositor_ = compositor;
-      UpdateLayer(true);
+      UpdateLayer();
       return PP_TRUE;
     }
   } else if (graphics_2d) {
     if (graphics_2d->BindToInstance(this)) {
       bound_graphics_2d_platform_ = graphics_2d;
-      UpdateLayer(true);
+      UpdateLayer();
       return PP_TRUE;
     }
   } else if (graphics_3d) {
@@ -2324,7 +2323,7 @@
     if (graphics_3d->pp_instance() == pp_instance() &&
         graphics_3d->BindToInstance(true)) {
       bound_graphics_3d_ = graphics_3d;
-      UpdateLayer(true);
+      UpdateLayer();
       return PP_TRUE;
     }
   }
@@ -3095,7 +3094,7 @@
     DCHECK(!fullscreen_container_);
     fullscreen_container_ =
         render_frame_->CreatePepperFullscreenContainer(this);
-    UpdateLayer(false);
+    UpdateLayer();
   } else {
     DCHECK(fullscreen_container_);
     fullscreen_container_->Destroy();