Progress towards fixing 77536

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 495 matching lines @@
       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),
       destroy_handler_id_(0),
       dragged_at_horizontal_edge_(0),
       dragged_at_vertical_edge_(0),
-      accelerated_surface_acquired_(false),
+      compositing_surface_(gfx::kNullPluginWindow),
       last_mouse_down_(NULL) {
   host_->set_view(this);
 }
 
 RenderWidgetHostViewGtk::~RenderWidgetHostViewGtk() {
   set_last_mouse_down(NULL);
   view_.Destroy();
 }
 
 void RenderWidgetHostViewGtk::InitAsChild() {
@@ skipping 236 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_) {
+  if (compositing_surface_ != gfx::kNullPluginWindow) {
     GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
-    gfx::NativeViewId view_id = gfx::IdFromNativeView(GetNativeView());
-    gfx::PluginWindowHandle surface = manager->GetXIDForId(&surface, view_id);
-    manager->ReleasePermanentXID(surface);
+    manager->ReleasePermanentXID(compositing_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
@@ skipping 333 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());
+gfx::PluginWindowHandle RenderWidgetHostViewGtk::GetCompositingSurface() {
+  if (compositing_surface_ == gfx::kNullPluginWindow) {
+    GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
+    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;
+    if (!manager->GetPermanentXIDForId(&compositing_surface_, view_id)) {
+      DLOG(ERROR) << "Can't find XID for view id " << view_id;
+    }
   }
-  return surface;
-}
-
-void RenderWidgetHostViewGtk::ReleaseCompositingSurface(
-    gfx::PluginWindowHandle surface) {
-  GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
-  manager->ReleasePermanentXID(surface);
-  accelerated_surface_acquired_ = false;
+  return compositing_surface_;
 }
 
 void RenderWidgetHostViewGtk::ForwardKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if (!host_)
     return;
 
   EditCommands edit_commands;
   if (!event.skip_in_browser &&
       key_bindings_handler_->Match(event, &edit_commands)) {
@@ skipping 35 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);
 }