Refactor how surfaces are acquired for GPU compositing.

chrome/browser/renderer_host/render_widget_host_view_gtk.cc

 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 
 // If this gets included after the gtk headers, then a bunch of compiler
 // errors happen because of a "#define Status int" in Xlib.h, which interacts
 // badly with net::URLRequestStatus::Status.
 #include "chrome/common/render_messages.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_preserve_window.h"
+#include "ui/gfx/gtk_native_view_id_manager.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor_gtk_data.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
 #if defined(OS_CHROMEOS)
 #include "views/widget/tooltip_window_gtk.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace {
 
@@ skipping 437 matching lines @@
       is_loading_(false),
       is_showing_context_menu_(false),
       overlay_color_(0),
       overlay_animation_(this),
       parent_(NULL),
       is_popup_first_mouse_release_(true),
       was_focused_before_grab_(false),
       do_x_grab_(false),
       is_fullscreen_(false),
       dragged_at_horizontal_edge_(0),
-      dragged_at_vertical_edge_(0) {
+      dragged_at_vertical_edge_(0),
+      accelerated_surface_acquired_(false) {
   host_->set_view(this);
 }
 
 RenderWidgetHostViewGtk::~RenderWidgetHostViewGtk() {
   view_.Destroy();
 }
 
 void RenderWidgetHostViewGtk::InitAsChild() {
   DoSharedInit();
   overlay_animation_.SetDuration(kFadeEffectDuration);
@@ skipping 216 matching lines @@
   }
 }
 
 void RenderWidgetHostViewGtk::RenderViewGone(base::TerminationStatus status,
                                              int error_code) {
   Destroy();
   plugin_container_manager_.set_host_widget(NULL);
 }
 
 void RenderWidgetHostViewGtk::Destroy() {
+  if (accelerated_surface_acquired_) {
+    GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
+    gfx::NativeViewId view_id = gfx::IdFromNativeView(GetNativeView());
+    gfx::PluginWindowHandle surface = manager->GetXIDForId(&surface, view_id);
+    manager->ReleasePermanentXID(surface);
+  }
+
   if (do_x_grab_) {
     // Undo the X grab.
     GdkDisplay* display = gtk_widget_get_display(parent_);
     gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME);
     gdk_display_keyboard_ungrab(display, GDK_CURRENT_TIME);
   }
 
   // If this is a popup or fullscreen widget, then we need to destroy the window
   // that we created to hold it.
   if (IsPopup() || is_fullscreen_)
@@ skipping 319 matching lines @@
   return false;
 }
 
 void RenderWidgetHostViewGtk::AcceleratedCompositingActivated(bool activated) {
   GtkPreserveWindow* widget =
     reinterpret_cast<GtkPreserveWindow*>(view_.get());
 
   gtk_preserve_window_delegate_resize(widget, activated);
 }
 
+gfx::PluginWindowHandle RenderWidgetHostViewGtk::AcquireCompositingSurface() {
+  GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
+  gfx::PluginWindowHandle surface = gfx::kNullPluginWindow;
+  gfx::NativeViewId view_id = gfx::IdFromNativeView(GetNativeView());
+
+  if (!manager->GetPermanentXIDForId(&surface, view_id)) {
+    DLOG(ERROR) << "Can't find XID for view id " << view_id;
+  } else {
+    accelerated_surface_acquired_ = true;
+  }
+  return surface;
+}
+
+void RenderWidgetHostViewGtk::ReleaseCompositingSurface(
+    gfx::PluginWindowHandle surface) {
+  GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
+  manager->ReleasePermanentXID(surface);
+  accelerated_surface_acquired_ = false;
+}
+
 void RenderWidgetHostViewGtk::ForwardKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if (!host_)
     return;
 
   EditCommands edit_commands;
   if (!event.skip_in_browser &&
       key_bindings_handler_->Match(event, &edit_commands)) {
     host_->ForwardEditCommandsForNextKeyEvent(edit_commands);
     NativeWebKeyboardEvent copy_event(event);
@@ skipping 20 matching lines @@
 }
 
 // static
 RenderWidgetHostView*
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView widget) {
   gpointer user_data = g_object_get_data(G_OBJECT(widget),
                                          kRenderWidgetHostViewKey);
   return reinterpret_cast<RenderWidgetHostView*>(user_data);
 }