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

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

Issue 739993002: MacViews: Fix build errors related to NativeWebKeyboardEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix for Sadrul Created 6 years 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
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/public/browser/native_web_keyboard_event.h" 5 #include "content/public/browser/native_web_keyboard_event.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "third_party/WebKit/public/web/mac/WebInputEventFactory.h" 9 #include "third_party/WebKit/public/web/mac/WebInputEventFactory.h"
10 #include "ui/events/event.h"
10 11
11 using blink::WebInputEventFactory; 12 using blink::WebInputEventFactory;
12 13
13 namespace content { 14 namespace content {
14 15
15 NativeWebKeyboardEvent::NativeWebKeyboardEvent() 16 NativeWebKeyboardEvent::NativeWebKeyboardEvent()
16 : os_event(NULL), 17 : os_event(NULL),
17 skip_in_browser(false) { 18 skip_in_browser(false) {
18 } 19 }
19 20
20 NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event) 21 NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
21 : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(native_event)), 22 : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(native_event)),
22 os_event([native_event retain]), 23 os_event([native_event retain]),
23 skip_in_browser(false) { 24 skip_in_browser(false) {
24 } 25 }
25 26
26 NativeWebKeyboardEvent::NativeWebKeyboardEvent(wchar_t character, 27 NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event)
27 int modifiers, 28 : NativeWebKeyboardEvent(key_event.native_event()) {
28 double time_stamp_seconds)
29 : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(character,
30 modifiers,
31 time_stamp_seconds)),
32 os_event(NULL),
33 skip_in_browser(false) {
34 } 29 }
35 30
36 NativeWebKeyboardEvent::NativeWebKeyboardEvent( 31 NativeWebKeyboardEvent::NativeWebKeyboardEvent(
37 const NativeWebKeyboardEvent& other) 32 const NativeWebKeyboardEvent& other)
38 : WebKeyboardEvent(other), 33 : WebKeyboardEvent(other),
39 os_event([other.os_event retain]), 34 os_event([other.os_event retain]),
40 skip_in_browser(other.skip_in_browser) { 35 skip_in_browser(other.skip_in_browser) {
41 } 36 }
42 37
43 NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=( 38 NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(
44 const NativeWebKeyboardEvent& other) { 39 const NativeWebKeyboardEvent& other) {
45 WebKeyboardEvent::operator=(other); 40 WebKeyboardEvent::operator=(other);
46 41
47 NSObject* previous = os_event; 42 NSObject* previous = os_event;
48 os_event = [other.os_event retain]; 43 os_event = [other.os_event retain];
49 [previous release]; 44 [previous release];
50 45
51 skip_in_browser = other.skip_in_browser; 46 skip_in_browser = other.skip_in_browser;
52 47
53 return *this; 48 return *this;
54 } 49 }
55 50
56 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { 51 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
57 [os_event release]; 52 [os_event release];
58 } 53 }
59 54
60 } // namespace content 55 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698