| 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 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 663 if (rect.IsEmpty()) | 663 if (rect.IsEmpty()) |
| 664 continue; | 664 continue; |
| 665 | 665 |
| 666 if (about_to_validate_and_paint_) | 666 if (about_to_validate_and_paint_) |
| 667 invalid_rect_ = invalid_rect_.Union(rect); | 667 invalid_rect_ = invalid_rect_.Union(rect); |
| 668 else | 668 else |
| 669 Paint(rect); | 669 Paint(rect); |
| 670 } | 670 } |
| 671 } | 671 } |
| 672 | 672 |
| 673 void RenderWidgetHostViewGtk::RenderViewGone() { | 673 void RenderWidgetHostViewGtk::RenderViewGone(base::TerminationStatus status, |
| 674 int error_code) { |
| 674 Destroy(); | 675 Destroy(); |
| 675 plugin_container_manager_.set_host_widget(NULL); | 676 plugin_container_manager_.set_host_widget(NULL); |
| 676 } | 677 } |
| 677 | 678 |
| 678 void RenderWidgetHostViewGtk::Destroy() { | 679 void RenderWidgetHostViewGtk::Destroy() { |
| 679 if (IsPopup()) { | 680 if (IsPopup()) { |
| 680 if (do_x_grab_) { | 681 if (do_x_grab_) { |
| 681 // Undo the X grab. | 682 // Undo the X grab. |
| 682 GdkDisplay* display = gtk_widget_get_display(parent_); | 683 GdkDisplay* display = gtk_widget_get_display(parent_); |
| 683 gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME); | 684 gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME); |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1068 } | 1069 } |
| 1069 | 1070 |
| 1070 // static | 1071 // static |
| 1071 RenderWidgetHostView* | 1072 RenderWidgetHostView* |
| 1072 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( | 1073 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( |
| 1073 gfx::NativeView widget) { | 1074 gfx::NativeView widget) { |
| 1074 gpointer user_data = g_object_get_data(G_OBJECT(widget), | 1075 gpointer user_data = g_object_get_data(G_OBJECT(widget), |
| 1075 kRenderWidgetHostViewKey); | 1076 kRenderWidgetHostViewKey); |
| 1076 return reinterpret_cast<RenderWidgetHostView*>(user_data); | 1077 return reinterpret_cast<RenderWidgetHostView*>(user_data); |
| 1077 } | 1078 } |
| OLD | NEW |