OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 net::URLRequestStatus::Status. | 9 // badly with net::URLRequestStatus::Status. |
10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
719 } | 719 } |
720 | 720 |
721 void RenderWidgetHostViewGtk::SetIsLoading(bool is_loading) { | 721 void RenderWidgetHostViewGtk::SetIsLoading(bool is_loading) { |
722 is_loading_ = is_loading; | 722 is_loading_ = is_loading; |
723 // Only call ShowCurrentCursor() when it will actually change the cursor. | 723 // Only call ShowCurrentCursor() when it will actually change the cursor. |
724 if (current_cursor_.GetCursorType() == GDK_LAST_CURSOR) | 724 if (current_cursor_.GetCursorType() == GDK_LAST_CURSOR) |
725 ShowCurrentCursor(); | 725 ShowCurrentCursor(); |
726 } | 726 } |
727 | 727 |
728 void RenderWidgetHostViewGtk::ImeUpdateTextInputState( | 728 void RenderWidgetHostViewGtk::ImeUpdateTextInputState( |
729 WebKit::WebTextInputType type, | 729 ui::TextInputType type, |
| 730 bool can_compose_inline, |
730 const gfx::Rect& caret_rect) { | 731 const gfx::Rect& caret_rect) { |
731 im_context_->UpdateInputMethodState(type, caret_rect); | 732 im_context_->UpdateInputMethodState(type, can_compose_inline, caret_rect); |
732 } | 733 } |
733 | 734 |
734 void RenderWidgetHostViewGtk::ImeCancelComposition() { | 735 void RenderWidgetHostViewGtk::ImeCancelComposition() { |
735 im_context_->CancelComposition(); | 736 im_context_->CancelComposition(); |
736 } | 737 } |
737 | 738 |
738 void RenderWidgetHostViewGtk::DidUpdateBackingStore( | 739 void RenderWidgetHostViewGtk::DidUpdateBackingStore( |
739 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, | 740 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, |
740 const std::vector<gfx::Rect>& copy_rects) { | 741 const std::vector<gfx::Rect>& copy_rects) { |
741 if (is_hidden_) | 742 if (is_hidden_) |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1186 } | 1187 } |
1187 | 1188 |
1188 // static | 1189 // static |
1189 RenderWidgetHostView* | 1190 RenderWidgetHostView* |
1190 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( | 1191 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( |
1191 gfx::NativeView widget) { | 1192 gfx::NativeView widget) { |
1192 gpointer user_data = g_object_get_data(G_OBJECT(widget), | 1193 gpointer user_data = g_object_get_data(G_OBJECT(widget), |
1193 kRenderWidgetHostViewKey); | 1194 kRenderWidgetHostViewKey); |
1194 return reinterpret_cast<RenderWidgetHostView*>(user_data); | 1195 return reinterpret_cast<RenderWidgetHostView*>(user_data); |
1195 } | 1196 } |
OLD | NEW |