| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/renderer_host/render_widget_host_view_gtk.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
| 6 | 6 |
| 7 // If this gets included after the gtk headers, then a bunch of compiler | 7 // If this gets included after the gtk headers, then a bunch of compiler |
| 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts | 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts |
| 9 // badly with URLRequestStatus::Status. | 9 // badly with URLRequestStatus::Status. |
| 10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 if (rect.IsEmpty()) | 659 if (rect.IsEmpty()) |
| 660 continue; | 660 continue; |
| 661 | 661 |
| 662 if (about_to_validate_and_paint_) | 662 if (about_to_validate_and_paint_) |
| 663 invalid_rect_ = invalid_rect_.Union(rect); | 663 invalid_rect_ = invalid_rect_.Union(rect); |
| 664 else | 664 else |
| 665 Paint(rect); | 665 Paint(rect); |
| 666 } | 666 } |
| 667 } | 667 } |
| 668 | 668 |
| 669 void RenderWidgetHostViewGtk::RenderViewGone() { | 669 void RenderWidgetHostViewGtk::RenderViewGone(base::TerminationStatus status, |
| 670 int error_code) { |
| 670 Destroy(); | 671 Destroy(); |
| 671 plugin_container_manager_.set_host_widget(NULL); | 672 plugin_container_manager_.set_host_widget(NULL); |
| 672 } | 673 } |
| 673 | 674 |
| 674 void RenderWidgetHostViewGtk::Destroy() { | 675 void RenderWidgetHostViewGtk::Destroy() { |
| 675 if (IsPopup()) { | 676 if (IsPopup()) { |
| 676 if (do_x_grab_) { | 677 if (do_x_grab_) { |
| 677 // Undo the X grab. | 678 // Undo the X grab. |
| 678 GdkDisplay* display = gtk_widget_get_display(parent_); | 679 GdkDisplay* display = gtk_widget_get_display(parent_); |
| 679 gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME); | 680 gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME); |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1062 } | 1063 } |
| 1063 | 1064 |
| 1064 // static | 1065 // static |
| 1065 RenderWidgetHostView* | 1066 RenderWidgetHostView* |
| 1066 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( | 1067 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( |
| 1067 gfx::NativeView widget) { | 1068 gfx::NativeView widget) { |
| 1068 gpointer user_data = g_object_get_data(G_OBJECT(widget), | 1069 gpointer user_data = g_object_get_data(G_OBJECT(widget), |
| 1069 kRenderWidgetHostViewKey); | 1070 kRenderWidgetHostViewKey); |
| 1070 return reinterpret_cast<RenderWidgetHostView*>(user_data); | 1071 return reinterpret_cast<RenderWidgetHostView*>(user_data); |
| 1071 } | 1072 } |
| OLD | NEW |