| 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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 if (rect.IsEmpty()) | 662 if (rect.IsEmpty()) |
| 663 continue; | 663 continue; |
| 664 | 664 |
| 665 if (about_to_validate_and_paint_) | 665 if (about_to_validate_and_paint_) |
| 666 invalid_rect_ = invalid_rect_.Union(rect); | 666 invalid_rect_ = invalid_rect_.Union(rect); |
| 667 else | 667 else |
| 668 Paint(rect); | 668 Paint(rect); |
| 669 } | 669 } |
| 670 } | 670 } |
| 671 | 671 |
| 672 void RenderWidgetHostViewGtk::RenderViewGone() { | 672 void RenderWidgetHostViewGtk::RenderViewGone(base::TerminationStatus status, |
| 673 int error_code) { |
| 673 Destroy(); | 674 Destroy(); |
| 674 plugin_container_manager_.set_host_widget(NULL); | 675 plugin_container_manager_.set_host_widget(NULL); |
| 675 } | 676 } |
| 676 | 677 |
| 677 void RenderWidgetHostViewGtk::Destroy() { | 678 void RenderWidgetHostViewGtk::Destroy() { |
| 678 if (IsPopup()) { | 679 if (IsPopup()) { |
| 679 if (do_x_grab_) { | 680 if (do_x_grab_) { |
| 680 // Undo the X grab. | 681 // Undo the X grab. |
| 681 GdkDisplay* display = gtk_widget_get_display(parent_); | 682 GdkDisplay* display = gtk_widget_get_display(parent_); |
| 682 gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME); | 683 gdk_display_pointer_ungrab(display, GDK_CURRENT_TIME); |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1102 } | 1103 } |
| 1103 | 1104 |
| 1104 // static | 1105 // static |
| 1105 RenderWidgetHostView* | 1106 RenderWidgetHostView* |
| 1106 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( | 1107 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( |
| 1107 gfx::NativeView widget) { | 1108 gfx::NativeView widget) { |
| 1108 gpointer user_data = g_object_get_data(G_OBJECT(widget), | 1109 gpointer user_data = g_object_get_data(G_OBJECT(widget), |
| 1109 kRenderWidgetHostViewKey); | 1110 kRenderWidgetHostViewKey); |
| 1110 return reinterpret_cast<RenderWidgetHostView*>(user_data); | 1111 return reinterpret_cast<RenderWidgetHostView*>(user_data); |
| 1111 } | 1112 } |
| OLD | NEW |