(not for review) Fix composited-to-non-composited corruption on Linux.

content/browser/renderer_host/render_widget_host_view_gtk.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/renderer_host/render_widget_host_view_gtk.h"
 
-#include <cairo/cairo.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-
 #include <algorithm>
 #include <string>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/accessibility/browser_accessibility_gtk.h"
 #include "content/browser/accessibility/browser_accessibility_manager_gtk.h"
+#include "content/browser/gpu/gpu_process_host.h"
+#include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/backing_store_gtk.h"
 #include "content/browser/renderer_host/gtk_im_context_wrapper.h"
 #include "content/browser/renderer_host/gtk_key_bindings_handler.h"
 #include "content/browser/renderer_host/gtk_window_utils.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_gtk.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/common/webplugin_geometry.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/content_switches.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebScreenInfo.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/x/active_window_watcher_x.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_compat.h"
 #include "ui/gfx/gtk_native_view_id_manager.h"
 #include "ui/gfx/gtk_preserve_window.h"
 #include "ui/gfx/text_elider.h"
 #include "webkit/common/cursors/webcursor_gtk_data.h"
 
+#include <cairo/cairo.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
 using WebKit::WebMouseWheelEvent;
 using WebKit::WebScreenInfo;
 
 namespace content {
 namespace {
 
 // Paint rects on Linux are bounded by the maximum size of a shared memory
 // region. By default that's 32MB, but many distros increase it significantly
 // (i.e. to 256MB).
 //
@@ skipping 484 matching lines @@
       is_popup_first_mouse_release_(true),
       was_imcontext_focused_before_grab_(false),
       do_x_grab_(false),
       is_fullscreen_(false),
       made_active_(false),
       mouse_is_being_warped_to_unlocked_position_(false),
       destroy_handler_id_(0),
       dragged_at_horizontal_edge_(0),
       dragged_at_vertical_edge_(0),
       compositing_surface_(gfx::kNullPluginWindow),
+      last_frame_was_composited_(false),
       last_mouse_down_(NULL) {
   host_->SetView(this);
   if (host_->is_hidden())
     WasHidden();
 }
 
 RenderWidgetHostViewGtk::~RenderWidgetHostViewGtk() {
   UnlockMouse();
   set_last_mouse_down(NULL);
   view_.Destroy();
@@ skipping 493 matching lines @@
 }
 
 void RenderWidgetHostViewGtk::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.sync_point = 0;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(
       params.route_id, gpu_host_id, ack_params);
   host_->FrameSwapped(params.latency_info);
+
+  if (!last_frame_was_composited_ &&
+      compositing_surface_ != gfx::kNullPluginWindow) {
+    GpuProcessHostUIShim* host = GpuProcessHostUIShim::GetOneInstance();
+    int32 surface_id = compositing_surface_;
+    if (host) {
+      bool compositing_active = true;
+      host->AcceleratedCompositingStateChange(surface_id, compositing_active);
+    }
+    last_frame_was_composited_ = true;
+  }
 }
 
 void RenderWidgetHostViewGtk::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.sync_point = 0;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(
       params.route_id, gpu_host_id, ack_params);
   host_->FrameSwapped(params.latency_info);
@@ skipping 71 matching lines @@
   dragged_at_vertical_edge_ = new_dragged_at_vertical_edge;
 }
 
 void RenderWidgetHostViewGtk::Paint(const gfx::Rect& damage_rect) {
   TRACE_EVENT0("ui::gtk", "RenderWidgetHostViewGtk::Paint");
 
   // If the GPU process is rendering directly into the View,
   // call the compositor directly.
   RenderWidgetHostImpl* render_widget_host =
       RenderWidgetHostImpl::From(GetRenderWidgetHost());
+
   if (render_widget_host->is_accelerated_compositing_active()) {
     host_->ScheduleComposite();
     return;
   }
 
   GdkWindow* window = gtk_widget_get_window(view_.get());
   DCHECK(!about_to_validate_and_paint_);
 
   invalid_rect_ = damage_rect;
   about_to_validate_and_paint_ = true;
@@ skipping 37 matching lines @@
     }
     software_latency_info_.swap_timestamp = base::TimeTicks::HighResNow();
     render_widget_host->FrameSwapped(software_latency_info_);
     software_latency_info_.Clear();
   } else {
     if (window)
       gdk_window_clear(window);
     if (whiteout_start_time_.is_null())
       whiteout_start_time_ = base::TimeTicks::Now();
   }
+
+  if (last_frame_was_composited_ &&
+    compositing_surface_ != gfx::kNullPluginWindow) {
+    GpuProcessHostUIShim* host = GpuProcessHostUIShim::GetOneInstance();
+    int32 surface_id = compositing_surface_;
+    if (host) {
+      bool compositing_active = false;
+      host->AcceleratedCompositingStateChange(surface_id, compositing_active);
+    }
+    last_frame_was_composited_ = false;
+  }
 }
 
 void RenderWidgetHostViewGtk::ShowCurrentCursor() {
   // The widget may not have a window. If that's the case, abort mission. This
   // is the same issue as that explained above in Paint().
   if (!gtk_widget_get_window(view_.get()))
     return;
 
   // TODO(port): WebKit bug https://bugs.webkit.org/show_bug.cgi?id=16388 is
   // that calling gdk_window_set_cursor repeatedly is expensive.  We should
@@ skipping 344 matching lines @@
     gfx::PluginWindowHandle id) {
   plugin_container_manager_.CreatePluginContainer(id);
 }
 
 void RenderWidgetHostViewGtk::OnDestroyPluginContainer(
     gfx::PluginWindowHandle id) {
   plugin_container_manager_.DestroyPluginContainer(id);
 }
 
 }  // namespace content