| Index: content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| index 27240638782c70c2b5a6dd7fc9b272eb7af9837b..9df981051dba5289404ffb3974608f5bf75ae1cd 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
|
| @@ -582,7 +582,7 @@ RenderWidgetHostViewGtk::RenderWidgetHostViewGtk(RenderWidgetHost* widget_host)
|
| dragged_at_vertical_edge_(0),
|
| compositing_surface_(gfx::kNullPluginWindow),
|
| last_mouse_down_(NULL) {
|
| - host_ = static_cast<RenderWidgetHostImpl*>(widget_host);
|
| + host_ = widget_host->AsRWHImpl();
|
| host_->SetView(this);
|
| }
|
|
|
| @@ -1035,7 +1035,7 @@ void RenderWidgetHostViewGtk::AcceleratedSurfaceSuspend() {
|
|
|
| void RenderWidgetHostViewGtk::SetBackground(const SkBitmap& background) {
|
| content::RenderWidgetHostViewBase::SetBackground(background);
|
| - host_->Send(new ViewMsg_SetBackground(host_->routing_id(), background));
|
| + host_->Send(new ViewMsg_SetBackground(host_->GetRoutingID(), background));
|
| }
|
|
|
| void RenderWidgetHostViewGtk::ModifyEventForEdgeDragging(
|
| @@ -1096,8 +1096,7 @@ void RenderWidgetHostViewGtk::Paint(const gfx::Rect& damage_rect) {
|
|
|
| // If the GPU process is rendering directly into the View,
|
| // call the compositor directly.
|
| - RenderWidgetHostImpl* render_widget_host =
|
| - static_cast<RenderWidgetHostImpl*>(GetRenderWidgetHost());
|
| + RenderWidgetHostImpl* render_widget_host = GetRenderWidgetHost()->AsRWHImpl();
|
| if (render_widget_host->is_accelerated_compositing_active()) {
|
| host_->ScheduleComposite();
|
| return;
|
| @@ -1315,7 +1314,7 @@ void RenderWidgetHostViewGtk::ForwardKeyboardEvent(
|
| if (!event.skip_in_browser &&
|
| key_bindings_handler_->Match(event, &edit_commands)) {
|
| host_->Send(new ViewMsg_SetEditCommandsForNextKeyEvent(
|
| - host_->routing_id(), edit_commands));
|
| + host_->GetRoutingID(), edit_commands));
|
| NativeWebKeyboardEvent copy_event(event);
|
| copy_event.match_edit_command = true;
|
| host_->ForwardKeyboardEvent(copy_event);
|
|
|