| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/plugins/gtk_plugin_container_manager.h" | 5 #include "webkit/glue/plugins/gtk_plugin_container_manager.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/gfx/gtk_util.h" | 9 #include "base/gfx/gtk_util.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 gfx::PluginWindowHandle id) { | 45 gfx::PluginWindowHandle id) { |
| 46 DCHECK(host_widget_); | 46 DCHECK(host_widget_); |
| 47 GtkWidget* widget = MapIDToWidget(id); | 47 GtkWidget* widget = MapIDToWidget(id); |
| 48 if (widget) | 48 if (widget) |
| 49 gtk_widget_destroy(widget); | 49 gtk_widget_destroy(widget); |
| 50 | 50 |
| 51 plugin_window_to_widget_map_.erase(id); | 51 plugin_window_to_widget_map_.erase(id); |
| 52 } | 52 } |
| 53 | 53 |
| 54 void GtkPluginContainerManager::MovePluginContainer( | 54 void GtkPluginContainerManager::MovePluginContainer( |
| 55 const WebPluginGeometry& move) { | 55 const webkit_glue::WebPluginGeometry& move) { |
| 56 DCHECK(host_widget_); | 56 DCHECK(host_widget_); |
| 57 GtkWidget *widget = MapIDToWidget(move.window); | 57 GtkWidget *widget = MapIDToWidget(move.window); |
| 58 if (!widget) | 58 if (!widget) |
| 59 return; | 59 return; |
| 60 | 60 |
| 61 DCHECK(!GTK_WIDGET_NO_WINDOW(widget)); | 61 DCHECK(!GTK_WIDGET_NO_WINDOW(widget)); |
| 62 DCHECK(GTK_WIDGET_REALIZED(widget)); | 62 DCHECK(GTK_WIDGET_REALIZED(widget)); |
| 63 | 63 |
| 64 if (!move.visible) { | 64 if (!move.visible) { |
| 65 gtk_widget_hide(widget); | 65 gtk_widget_hide(widget); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 // static | 135 // static |
| 136 void GtkPluginContainerManager::RealizeCallback(GtkWidget* widget, | 136 void GtkPluginContainerManager::RealizeCallback(GtkWidget* widget, |
| 137 void* user_data) { | 137 void* user_data) { |
| 138 GtkPluginContainerManager* plugin_container_manager = | 138 GtkPluginContainerManager* plugin_container_manager = |
| 139 static_cast<GtkPluginContainerManager*>(user_data); | 139 static_cast<GtkPluginContainerManager*>(user_data); |
| 140 | 140 |
| 141 gfx::PluginWindowHandle id = plugin_container_manager->MapWidgetToID(widget); | 141 gfx::PluginWindowHandle id = plugin_container_manager->MapWidgetToID(widget); |
| 142 if (id) | 142 if (id) |
| 143 gtk_socket_add_id(GTK_SOCKET(widget), id); | 143 gtk_socket_add_id(GTK_SOCKET(widget), id); |
| 144 } | 144 } |
| OLD | NEW |