| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
| 6 | 6 |
| 7 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
| 8 #include <OpenGL/gl.h> | 8 #include <OpenGL/gl.h> |
| 9 #include <QuartzCore/QuartzCore.h> | 9 #include <QuartzCore/QuartzCore.h> |
| 10 #include <stdint.h> | 10 #include <stdint.h> |
| (...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1008 is_loading_ = is_loading; | 1008 is_loading_ = is_loading; |
| 1009 // If we ever decide to show the waiting cursor while the page is loading | 1009 // If we ever decide to show the waiting cursor while the page is loading |
| 1010 // like Chrome does on Windows, call |UpdateCursor()| here. | 1010 // like Chrome does on Windows, call |UpdateCursor()| here. |
| 1011 } | 1011 } |
| 1012 | 1012 |
| 1013 void RenderWidgetHostViewMac::UpdateInputMethodIfNecessary( | 1013 void RenderWidgetHostViewMac::UpdateInputMethodIfNecessary( |
| 1014 bool text_input_state_changed) { | 1014 bool text_input_state_changed) { |
| 1015 if (!text_input_state_changed) | 1015 if (!text_input_state_changed) |
| 1016 return; | 1016 return; |
| 1017 | 1017 |
| 1018 // TODO(ekaramad): The state tracking is all in WebContentsImpl now. Remove | |
| 1019 // these member variables (crbug.com/602427). | |
| 1020 const TextInputState* state = | |
| 1021 render_widget_host_->delegate()->GetTextInputState(); | |
| 1022 text_input_type_ = state->type; | |
| 1023 can_compose_inline_ = state->can_compose_inline; | |
| 1024 | |
| 1025 if (HasFocus()) { | 1018 if (HasFocus()) { |
| 1026 SetTextInputActive(true); | 1019 SetTextInputActive(true); |
| 1027 | 1020 |
| 1028 // Let AppKit cache the new input context to make IMEs happy. | 1021 // Let AppKit cache the new input context to make IMEs happy. |
| 1029 // See http://crbug.com/73039. | 1022 // See http://crbug.com/73039. |
| 1030 [NSApp updateWindows]; | 1023 [NSApp updateWindows]; |
| 1031 | 1024 |
| 1032 #ifndef __LP64__ | 1025 #ifndef __LP64__ |
| 1033 UseInputWindow(TSMGetActiveDocument(), !can_compose_inline_); | 1026 UseInputWindow(TSMGetActiveDocument(), !render_widget_host_->delegate() |
| 1027 ->GetTextInputState() |
| 1028 ->can_compose_inline); |
| 1034 #endif | 1029 #endif |
| 1035 } | 1030 } |
| 1036 } | 1031 } |
| 1037 | 1032 |
| 1038 void RenderWidgetHostViewMac::ImeCancelComposition() { | 1033 void RenderWidgetHostViewMac::ImeCancelComposition() { |
| 1039 [cocoa_view_ cancelComposition]; | 1034 [cocoa_view_ cancelComposition]; |
| 1040 } | 1035 } |
| 1041 | 1036 |
| 1042 void RenderWidgetHostViewMac::ImeCompositionRangeChanged( | 1037 void RenderWidgetHostViewMac::ImeCompositionRangeChanged( |
| 1043 const gfx::Range& range, | 1038 const gfx::Range& range, |
| (...skipping 2360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3404 | 3399 |
| 3405 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3400 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
| 3406 // regions that are not draggable. (See ControlRegionView in | 3401 // regions that are not draggable. (See ControlRegionView in |
| 3407 // native_app_window_cocoa.mm). This requires the render host view to be | 3402 // native_app_window_cocoa.mm). This requires the render host view to be |
| 3408 // draggable by default. | 3403 // draggable by default. |
| 3409 - (BOOL)mouseDownCanMoveWindow { | 3404 - (BOOL)mouseDownCanMoveWindow { |
| 3410 return YES; | 3405 return YES; |
| 3411 } | 3406 } |
| 3412 | 3407 |
| 3413 @end | 3408 @end |
| OLD | NEW |