| 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 #include <QuartzCore/QuartzCore.h> | 7 #include <QuartzCore/QuartzCore.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| 11 #include "base/debug/crash_logging.h" | 11 #include "base/debug/crash_logging.h" |
| 12 #include "base/debug/trace_event.h" | 12 #include "base/debug/trace_event.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/mac/mac_util.h" | 14 #include "base/mac/mac_util.h" |
| 15 #include "base/mac/scoped_cftyperef.h" | 15 #include "base/mac/scoped_cftyperef.h" |
| 16 #import "base/mac/scoped_nsautorelease_pool.h" | |
| 17 #import "base/memory/scoped_nsobject.h" | 16 #import "base/memory/scoped_nsobject.h" |
| 18 #include "base/message_loop.h" | 17 #include "base/message_loop.h" |
| 19 #include "base/metrics/histogram.h" | 18 #include "base/metrics/histogram.h" |
| 20 #include "base/stringprintf.h" | 19 #include "base/stringprintf.h" |
| 21 #include "base/string_util.h" | 20 #include "base/string_util.h" |
| 22 #include "base/sys_info.h" | 21 #include "base/sys_info.h" |
| 23 #include "base/sys_string_conversions.h" | 22 #include "base/sys_string_conversions.h" |
| 24 #include "base/utf_string_conversions.h" | 23 #include "base/utf_string_conversions.h" |
| 25 #import "content/browser/accessibility/browser_accessibility_cocoa.h" | 24 #import "content/browser/accessibility/browser_accessibility_cocoa.h" |
| 26 #include "content/browser/accessibility/browser_accessibility_manager.h" | 25 #include "content/browser/accessibility/browser_accessibility_manager.h" |
| 27 #include "content/browser/plugin_process_host.h" | |
| 28 #import "content/browser/renderer_host/accelerated_plugin_view_mac.h" | 26 #import "content/browser/renderer_host/accelerated_plugin_view_mac.h" |
| 29 #include "content/browser/renderer_host/backing_store_mac.h" | 27 #include "content/browser/renderer_host/backing_store_mac.h" |
| 30 #include "content/browser/renderer_host/backing_store_manager.h" | 28 #include "content/browser/renderer_host/backing_store_manager.h" |
| 31 #include "content/browser/renderer_host/compositing_iosurface_mac.h" | 29 #include "content/browser/renderer_host/compositing_iosurface_mac.h" |
| 32 #include "content/browser/renderer_host/render_process_host_impl.h" | |
| 33 #include "content/browser/renderer_host/render_view_host_impl.h" | 30 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 34 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_h
elper.h" | 31 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_h
elper.h" |
| 35 #import "content/browser/renderer_host/text_input_client_mac.h" | 32 #import "content/browser/renderer_host/text_input_client_mac.h" |
| 36 #include "content/common/accessibility_messages.h" | 33 #include "content/common/accessibility_messages.h" |
| 37 #include "content/common/edit_command.h" | 34 #include "content/common/edit_command.h" |
| 38 #include "content/common/gpu/gpu_messages.h" | 35 #include "content/common/gpu/gpu_messages.h" |
| 39 #include "content/common/plugin_messages.h" | 36 #include "content/common/plugin_messages.h" |
| 40 #include "content/common/view_messages.h" | 37 #include "content/common/view_messages.h" |
| 41 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" | 38 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" |
| 42 #include "content/public/browser/browser_thread.h" | 39 #include "content/public/browser/browser_thread.h" |
| 43 #include "content/public/browser/native_web_keyboard_event.h" | 40 #include "content/public/browser/native_web_keyboard_event.h" |
| 44 #import "content/public/browser/render_widget_host_view_mac_delegate.h" | 41 #import "content/public/browser/render_widget_host_view_mac_delegate.h" |
| 45 #include "skia/ext/platform_canvas.h" | 42 #include "skia/ext/platform_canvas.h" |
| 46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 48 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact
ory.h" | 45 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact
ory.h" |
| 49 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" | 46 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" |
| 50 #import "third_party/mozilla/ComplexTextInputPanel.h" | 47 #import "third_party/mozilla/ComplexTextInputPanel.h" |
| 51 #include "third_party/skia/include/core/SkColor.h" | |
| 52 #import "ui/base/cocoa/fullscreen_window_manager.h" | 48 #import "ui/base/cocoa/fullscreen_window_manager.h" |
| 53 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" | 49 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" |
| 54 #include "ui/base/keycodes/keyboard_codes.h" | 50 #include "ui/base/keycodes/keyboard_codes.h" |
| 55 #include "ui/base/layout.h" | 51 #include "ui/base/layout.h" |
| 56 #include "ui/gfx/point.h" | 52 #include "ui/gfx/point.h" |
| 57 #include "ui/gfx/rect_conversions.h" | 53 #include "ui/gfx/rect_conversions.h" |
| 58 #include "ui/gfx/size_conversions.h" | 54 #include "ui/gfx/size_conversions.h" |
| 59 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 55 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| 60 #include "ui/surface/io_surface_support_mac.h" | 56 #include "ui/surface/io_surface_support_mac.h" |
| 61 #include "webkit/plugins/npapi/webplugin.h" | 57 #include "webkit/plugins/npapi/webplugin.h" |
| (...skipping 3476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3538 if (!string) return NO; | 3534 if (!string) return NO; |
| 3539 | 3535 |
| 3540 // If the user is currently using an IME, confirm the IME input, | 3536 // If the user is currently using an IME, confirm the IME input, |
| 3541 // and then insert the text from the service, the same as TextEdit and Safari. | 3537 // and then insert the text from the service, the same as TextEdit and Safari. |
| 3542 [self confirmComposition]; | 3538 [self confirmComposition]; |
| 3543 [self insertText:string]; | 3539 [self insertText:string]; |
| 3544 return YES; | 3540 return YES; |
| 3545 } | 3541 } |
| 3546 | 3542 |
| 3547 @end | 3543 @end |
| OLD | NEW |