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

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

Issue 6718027: Refactor: Move app/surface to ui/gfx/surface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 9 months 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 | Annotate | Revision Log
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 <QuartzCore/QuartzCore.h> 5 #include <QuartzCore/QuartzCore.h>
6 6
7 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" 7 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
8 8
9 #include "app/surface/io_surface_support_mac.h"
10 #include "base/command_line.h" 9 #include "base/command_line.h"
11 #include "base/logging.h" 10 #include "base/logging.h"
12 #include "base/mac/scoped_cftyperef.h" 11 #include "base/mac/scoped_cftyperef.h"
13 #import "base/mac/scoped_nsautorelease_pool.h" 12 #import "base/mac/scoped_nsautorelease_pool.h"
14 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
15 #import "base/scoped_nsobject.h" 14 #import "base/scoped_nsobject.h"
16 #include "base/string_util.h" 15 #include "base/string_util.h"
17 #include "base/sys_info.h" 16 #include "base/sys_info.h"
18 #include "base/sys_string_conversions.h" 17 #include "base/sys_string_conversions.h"
19 #import "chrome/browser/accessibility/browser_accessibility_cocoa.h" 18 #import "chrome/browser/accessibility/browser_accessibility_cocoa.h"
(...skipping 16 matching lines...) Expand all
36 #include "content/common/gpu_messages.h" 35 #include "content/common/gpu_messages.h"
37 #include "content/common/native_web_keyboard_event.h" 36 #include "content/common/native_web_keyboard_event.h"
38 #include "content/common/plugin_messages.h" 37 #include "content/common/plugin_messages.h"
39 #include "content/common/view_messages.h" 38 #include "content/common/view_messages.h"
40 #include "skia/ext/platform_canvas.h" 39 #include "skia/ext/platform_canvas.h"
41 #import "third_party/mozilla/ComplexTextInputPanel.h" 40 #import "third_party/mozilla/ComplexTextInputPanel.h"
42 #include "third_party/skia/include/core/SkColor.h" 41 #include "third_party/skia/include/core/SkColor.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact ory.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact ory.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
45 #include "ui/gfx/gl/gl_switches.h" 44 #include "ui/gfx/gl/gl_switches.h"
45 #include "ui/gfx/surface/io_surface_support_mac.h"
46 #include "webkit/glue/webaccessibility.h" 46 #include "webkit/glue/webaccessibility.h"
47 #include "webkit/plugins/npapi/webplugin.h" 47 #include "webkit/plugins/npapi/webplugin.h"
48 48
49 using WebKit::WebInputEvent; 49 using WebKit::WebInputEvent;
50 using WebKit::WebInputEventFactory; 50 using WebKit::WebInputEventFactory;
51 using WebKit::WebMouseEvent; 51 using WebKit::WebMouseEvent;
52 using WebKit::WebMouseWheelEvent; 52 using WebKit::WebMouseWheelEvent;
53 53
54 static inline int ToWebKitModifiers(NSUInteger flags) { 54 static inline int ToWebKitModifiers(NSUInteger flags) {
55 int modifiers = 0; 55 int modifiers = 0;
(...skipping 2807 matching lines...) Expand 10 before | Expand all | Expand 10 after
2863 if (!string) return NO; 2863 if (!string) return NO;
2864 2864
2865 // If the user is currently using an IME, confirm the IME input, 2865 // If the user is currently using an IME, confirm the IME input,
2866 // and then insert the text from the service, the same as TextEdit and Safari. 2866 // and then insert the text from the service, the same as TextEdit and Safari.
2867 [self confirmComposition]; 2867 [self confirmComposition];
2868 [self insertText:string]; 2868 [self insertText:string];
2869 return YES; 2869 return YES;
2870 } 2870 }
2871 2871
2872 @end 2872 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698