Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 8340028: Salient parts of http://codereview.chromium.org/8392042/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/mac/mac_util.h" 11 #include "base/mac/mac_util.h"
12 #include "base/mac/scoped_cftyperef.h" 12 #include "base/mac/scoped_cftyperef.h"
13 #import "base/mac/scoped_nsautorelease_pool.h" 13 #import "base/mac/scoped_nsautorelease_pool.h"
14 #import "base/memory/scoped_nsobject.h"
14 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
15 #import "base/memory/scoped_nsobject.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/sys_info.h" 17 #include "base/sys_info.h"
18 #include "base/sys_string_conversions.h" 18 #include "base/sys_string_conversions.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #import "content/browser/accessibility/browser_accessibility_cocoa.h" 20 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
21 #include "content/browser/browser_thread.h"
22 #include "content/browser/gpu/gpu_process_host.h" 21 #include "content/browser/gpu/gpu_process_host.h"
23 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 22 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
24 #include "content/browser/mac/closure_blocks_leopard_compat.h" 23 #include "content/browser/mac/closure_blocks_leopard_compat.h"
25 #include "content/browser/plugin_process_host.h" 24 #include "content/browser/plugin_process_host.h"
26 #import "content/browser/renderer_host/accelerated_plugin_view_mac.h" 25 #import "content/browser/renderer_host/accelerated_plugin_view_mac.h"
27 #include "content/browser/renderer_host/backing_store_mac.h" 26 #include "content/browser/renderer_host/backing_store_mac.h"
28 #include "content/browser/renderer_host/render_process_host.h" 27 #include "content/browser/renderer_host/render_process_host.h"
29 #include "content/browser/renderer_host/render_view_host.h" 28 #include "content/browser/renderer_host/render_view_host.h"
30 #import "content/browser/renderer_host/render_widget_host_view_mac_delegate.h" 29 #import "content/browser/renderer_host/render_widget_host_view_mac_delegate.h"
31 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_h elper.h" 30 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_h elper.h"
32 #import "content/browser/renderer_host/text_input_client_mac.h" 31 #import "content/browser/renderer_host/text_input_client_mac.h"
33 #include "content/common/edit_command.h" 32 #include "content/common/edit_command.h"
34 #include "content/common/gpu/gpu_messages.h" 33 #include "content/common/gpu/gpu_messages.h"
35 #include "content/common/plugin_messages.h" 34 #include "content/common/plugin_messages.h"
36 #include "content/common/view_messages.h" 35 #include "content/common/view_messages.h"
36 #include "content/public/browser/browser_thread.h"
37 #include "content/public/browser/native_web_keyboard_event.h" 37 #include "content/public/browser/native_web_keyboard_event.h"
38 #include "skia/ext/platform_canvas.h" 38 #include "skia/ext/platform_canvas.h"
39 #import "third_party/mozilla/ComplexTextInputPanel.h"
40 #include "third_party/skia/include/core/SkColor.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact ory.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact ory.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact ory.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact ory.h"
43 #import "third_party/mozilla/ComplexTextInputPanel.h"
44 #include "third_party/skia/include/core/SkColor.h"
45 #include "ui/gfx/point.h" 45 #include "ui/gfx/point.h"
46 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 46 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
47 #include "ui/gfx/surface/io_surface_support_mac.h" 47 #include "ui/gfx/surface/io_surface_support_mac.h"
48 #include "webkit/glue/webaccessibility.h" 48 #include "webkit/glue/webaccessibility.h"
49 #include "webkit/plugins/npapi/webplugin.h" 49 #include "webkit/plugins/npapi/webplugin.h"
50 50
51 using WebKit::WebInputEvent; 51 using WebKit::WebInputEvent;
52 using WebKit::WebInputEventFactory; 52 using WebKit::WebInputEventFactory;
53 using WebKit::WebMouseEvent; 53 using WebKit::WebMouseEvent;
54 using WebKit::WebMouseWheelEvent; 54 using WebKit::WebMouseWheelEvent;
(...skipping 2693 matching lines...) Expand 10 before | Expand all | Expand 10 after
2748 if (!string) return NO; 2748 if (!string) return NO;
2749 2749
2750 // If the user is currently using an IME, confirm the IME input, 2750 // If the user is currently using an IME, confirm the IME input,
2751 // and then insert the text from the service, the same as TextEdit and Safari. 2751 // and then insert the text from the service, the same as TextEdit and Safari.
2752 [self confirmComposition]; 2752 [self confirmComposition];
2753 [self insertText:string]; 2753 [self insertText:string];
2754 return YES; 2754 return YES;
2755 } 2755 }
2756 2756
2757 @end 2757 @end
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698