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 "content/browser/renderer_host/render_widget_host_view_gtk.h" | 5 #include "content/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 "content/common/view_messages.h" | 10 #include "content/common/view_messages.h" |
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 void RenderWidgetHostViewGtk::SetIsLoading(bool is_loading) { | 731 void RenderWidgetHostViewGtk::SetIsLoading(bool is_loading) { |
732 is_loading_ = is_loading; | 732 is_loading_ = is_loading; |
733 // Only call ShowCurrentCursor() when it will actually change the cursor. | 733 // Only call ShowCurrentCursor() when it will actually change the cursor. |
734 if (current_cursor_.GetCursorType() == GDK_LAST_CURSOR) | 734 if (current_cursor_.GetCursorType() == GDK_LAST_CURSOR) |
735 ShowCurrentCursor(); | 735 ShowCurrentCursor(); |
736 } | 736 } |
737 | 737 |
738 void RenderWidgetHostViewGtk::ImeUpdateTextInputState( | 738 void RenderWidgetHostViewGtk::ImeUpdateTextInputState( |
739 ui::TextInputType type, | 739 ui::TextInputType type, |
740 bool can_compose_inline, | 740 bool can_compose_inline, |
741 const gfx::Rect& caret_rect) { | 741 const gfx::Rect& caret_rect, |
| 742 const string16& surrounding_text, |
| 743 size_t focus, |
| 744 size_t anchor) { |
742 im_context_->UpdateInputMethodState(type, can_compose_inline, caret_rect); | 745 im_context_->UpdateInputMethodState(type, can_compose_inline, caret_rect); |
743 } | 746 } |
744 | 747 |
745 void RenderWidgetHostViewGtk::ImeCancelComposition() { | 748 void RenderWidgetHostViewGtk::ImeCancelComposition() { |
746 im_context_->CancelComposition(); | 749 im_context_->CancelComposition(); |
747 } | 750 } |
748 | 751 |
749 void RenderWidgetHostViewGtk::DidUpdateBackingStore( | 752 void RenderWidgetHostViewGtk::DidUpdateBackingStore( |
750 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, | 753 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, |
751 const std::vector<gfx::Rect>& copy_rects) { | 754 const std::vector<gfx::Rect>& copy_rects) { |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1232 last_mouse_down_ = temp; | 1235 last_mouse_down_ = temp; |
1233 } | 1236 } |
1234 | 1237 |
1235 // static | 1238 // static |
1236 void RenderWidgetHostView::GetDefaultScreenInfo( | 1239 void RenderWidgetHostView::GetDefaultScreenInfo( |
1237 WebKit::WebScreenInfo* results) { | 1240 WebKit::WebScreenInfo* results) { |
1238 GdkWindow* gdk_window = | 1241 GdkWindow* gdk_window = |
1239 gdk_display_get_default_group(gdk_display_get_default()); | 1242 gdk_display_get_default_group(gdk_display_get_default()); |
1240 content::GetScreenInfoFromNativeWindow(gdk_window, results); | 1243 content::GetScreenInfoFromNativeWindow(gdk_window, results); |
1241 } | 1244 } |
OLD | NEW |