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 <Carbon/Carbon.h> | 7 #import <Carbon/Carbon.h> |
8 #import <objc/runtime.h> | 8 #import <objc/runtime.h> |
9 #include <OpenGL/gl.h> | 9 #include <OpenGL/gl.h> |
10 #include <QuartzCore/QuartzCore.h> | 10 #include <QuartzCore/QuartzCore.h> |
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
909 // returns nullptr. | 909 // returns nullptr. |
910 if (!widgetHost) | 910 if (!widgetHost) |
911 return; | 911 return; |
912 | 912 |
913 // Set the monitor state based on the text input focus state. | 913 // Set the monitor state based on the text input focus state. |
914 const bool has_focus = HasFocus(); | 914 const bool has_focus = HasFocus(); |
915 const TextInputState* state = text_input_manager->GetTextInputState(); | 915 const TextInputState* state = text_input_manager->GetTextInputState(); |
916 bool need_monitor_composition = | 916 bool need_monitor_composition = |
917 has_focus && state && state->type != ui::TEXT_INPUT_TYPE_NONE; | 917 has_focus && state && state->type != ui::TEXT_INPUT_TYPE_NONE; |
918 | 918 |
| 919 LOG(ERROR) << "OnUpdateTextInputStateCalled(): RequestCompositionUpdates(" |
| 920 << need_monitor_composition |
| 921 << ", \"" |
| 922 << WebContents::FromRenderViewHost(RenderViewHost::From(widgetHost)
)->GetLastCommittedURL().spec() |
| 923 << "\")"; |
| 924 |
919 widgetHost->RequestCompositionUpdates(false /* immediate_request */, | 925 widgetHost->RequestCompositionUpdates(false /* immediate_request */, |
920 need_monitor_composition); | 926 need_monitor_composition); |
921 | 927 |
922 if (has_focus) { | 928 if (has_focus) { |
923 SetTextInputActive(true); | 929 SetTextInputActive(true); |
924 | 930 |
925 // Let AppKit cache the new input context to make IMEs happy. | 931 // Let AppKit cache the new input context to make IMEs happy. |
926 // See http://crbug.com/73039. | 932 // See http://crbug.com/73039. |
927 [NSApp updateWindows]; | 933 [NSApp updateWindows]; |
928 | 934 |
(...skipping 2577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3506 | 3512 |
3507 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3513 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
3508 // regions that are not draggable. (See ControlRegionView in | 3514 // regions that are not draggable. (See ControlRegionView in |
3509 // native_app_window_cocoa.mm). This requires the render host view to be | 3515 // native_app_window_cocoa.mm). This requires the render host view to be |
3510 // draggable by default. | 3516 // draggable by default. |
3511 - (BOOL)mouseDownCanMoveWindow { | 3517 - (BOOL)mouseDownCanMoveWindow { |
3512 return YES; | 3518 return YES; |
3513 } | 3519 } |
3514 | 3520 |
3515 @end | 3521 @end |
OLD | NEW |