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

Side by Side Diff: ppapi/cpp/dev/ime_input_event_dev.cc

Issue 10391101: Test for Pepper IME events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments from kochi & merge master. Created 8 years, 7 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
« no previous file with comments | « ppapi/cpp/dev/ime_input_event_dev.h ('k') | ppapi/ppapi_sources.gypi » ('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 "ppapi/cpp/dev/ime_input_event_dev.h" 5 #include "ppapi/cpp/dev/ime_input_event_dev.h"
6 6
7 #include "ppapi/cpp/instance.h" 7 #include "ppapi/cpp/instance.h"
8 #include "ppapi/cpp/module.h" 8 #include "ppapi/cpp/module.h"
9 #include "ppapi/cpp/module_impl.h" 9 #include "ppapi/cpp/module_impl.h"
10 #include "ppapi/cpp/var.h" 10 #include "ppapi/cpp/var.h"
11 11
12 namespace pp { 12 namespace pp {
13 13
14 namespace { 14 namespace {
15 15
16 template <> const char* interface_name<PPB_IMEInputEvent_Dev>() { 16 template <> const char* interface_name<PPB_IMEInputEvent_Dev_0_2>() {
17 return PPB_IME_INPUT_EVENT_DEV_INTERFACE; 17 return PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2;
18 }
19
20 template <> const char* interface_name<PPB_IMEInputEvent_Dev_0_1>() {
21 return PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1;
18 } 22 }
19 23
20 } // namespace 24 } // namespace
21 25
22 // IMEInputEvent_Dev ------------------------------------------------------- 26 // IMEInputEvent_Dev -------------------------------------------------------
23 27
24 IMEInputEvent_Dev::IMEInputEvent_Dev() : InputEvent() { 28 IMEInputEvent_Dev::IMEInputEvent_Dev() : InputEvent() {
25 } 29 }
26 30
27 IMEInputEvent_Dev::IMEInputEvent_Dev(const InputEvent& event) : InputEvent() { 31 IMEInputEvent_Dev::IMEInputEvent_Dev(const InputEvent& event) : InputEvent() {
28 // Type check the input event before setting it. 32 bool is_ime_event = false;
29 if (!has_interface<PPB_IMEInputEvent_Dev>()) 33 if (has_interface<PPB_IMEInputEvent_Dev_0_2>()) {
30 return; 34 if (get_interface<PPB_IMEInputEvent_Dev_0_2>()->IsIMEInputEvent(
31 if (get_interface<PPB_IMEInputEvent_Dev>()->IsIMEInputEvent( 35 event.pp_resource())) {
32 event.pp_resource())) { 36 is_ime_event = true;
37 }
38 } else if (has_interface<PPB_IMEInputEvent_Dev_0_1>()) {
39 if (get_interface<PPB_IMEInputEvent_Dev_0_1>()->IsIMEInputEvent(
40 event.pp_resource())) {
41 is_ime_event = true;
42 }
43 }
44
45 if (is_ime_event) {
33 Module::Get()->core()->AddRefResource(event.pp_resource()); 46 Module::Get()->core()->AddRefResource(event.pp_resource());
34 PassRefFromConstructor(event.pp_resource()); 47 PassRefFromConstructor(event.pp_resource());
35 } 48 }
36 } 49 }
37 50
51 IMEInputEvent_Dev::IMEInputEvent_Dev(
52 const InstanceHandle& instance,
53 PP_InputEvent_Type type,
54 PP_TimeTicks time_stamp,
55 Var text,
56 const std::vector<uint32_t>& segment_offsets,
57 int32_t target_segment,
58 const std::pair<uint32_t, uint32_t>& selection) : InputEvent() {
59 if (!has_interface<PPB_IMEInputEvent_Dev_0_2>())
60 return;
61 uint32_t dummy = 0;
62 PassRefFromConstructor(get_interface<PPB_IMEInputEvent_Dev_0_2>()->Create(
63 instance.pp_instance(), type, time_stamp, text.pp_var(),
64 segment_offsets.empty() ? 0 : segment_offsets.size() - 1,
65 segment_offsets.empty() ? &dummy : &segment_offsets[0],
66 target_segment, selection.first, selection.second));
67 }
68
69
38 Var IMEInputEvent_Dev::GetText() const { 70 Var IMEInputEvent_Dev::GetText() const {
39 if (!has_interface<PPB_IMEInputEvent_Dev>()) 71 if (has_interface<PPB_IMEInputEvent_Dev_0_2>()) {
40 return Var(); 72 return Var(PASS_REF,
41 return Var(PASS_REF, 73 get_interface<PPB_IMEInputEvent_Dev_0_2>()->GetText(
42 get_interface<PPB_IMEInputEvent_Dev>()->GetText(pp_resource())); 74 pp_resource()));
75 } else if (has_interface<PPB_IMEInputEvent_Dev_0_1>()) {
76 return Var(PASS_REF,
77 get_interface<PPB_IMEInputEvent_Dev_0_1>()->GetText(
78 pp_resource()));
79 }
80 return Var();
43 } 81 }
44 82
45 uint32_t IMEInputEvent_Dev::GetSegmentNumber() const { 83 uint32_t IMEInputEvent_Dev::GetSegmentNumber() const {
46 if (!has_interface<PPB_IMEInputEvent_Dev>()) 84 if (has_interface<PPB_IMEInputEvent_Dev_0_2>()) {
47 return 0; 85 return get_interface<PPB_IMEInputEvent_Dev_0_2>()->GetSegmentNumber(
48 return get_interface<PPB_IMEInputEvent_Dev>()->GetSegmentNumber( 86 pp_resource());
49 pp_resource()); 87 } else if (has_interface<PPB_IMEInputEvent_Dev_0_1>()) {
88 return get_interface<PPB_IMEInputEvent_Dev_0_1>()->GetSegmentNumber(
89 pp_resource());
90 }
91 return 0;
50 } 92 }
51 93
52 uint32_t IMEInputEvent_Dev::GetSegmentOffset(uint32_t index) const { 94 uint32_t IMEInputEvent_Dev::GetSegmentOffset(uint32_t index) const {
53 if (!has_interface<PPB_IMEInputEvent_Dev>()) 95 if (has_interface<PPB_IMEInputEvent_Dev_0_2>()) {
54 return 0; 96 return get_interface<PPB_IMEInputEvent_Dev_0_2>()->GetSegmentOffset(
55 return get_interface<PPB_IMEInputEvent_Dev>()->GetSegmentOffset(pp_resource(), 97 pp_resource(), index);
56 index); 98 } else if (has_interface<PPB_IMEInputEvent_Dev_0_1>()) {
99 return get_interface<PPB_IMEInputEvent_Dev_0_1>()->GetSegmentOffset(
100 pp_resource(), index);
101 }
102 return 0;
57 } 103 }
58 104
59 int32_t IMEInputEvent_Dev::GetTargetSegment() const { 105 int32_t IMEInputEvent_Dev::GetTargetSegment() const {
60 if (!has_interface<PPB_IMEInputEvent_Dev>()) 106 if (has_interface<PPB_IMEInputEvent_Dev_0_2>()) {
61 return 0; 107 return get_interface<PPB_IMEInputEvent_Dev_0_2>()->GetTargetSegment(
62 return get_interface<PPB_IMEInputEvent_Dev>()->GetTargetSegment( 108 pp_resource());
63 pp_resource()); 109 } else if (has_interface<PPB_IMEInputEvent_Dev_0_1>()) {
110 return get_interface<PPB_IMEInputEvent_Dev_0_1>()->GetTargetSegment(
111 pp_resource());
112 }
113 return 0;
64 } 114 }
65 115
66 std::pair<uint32_t, uint32_t> IMEInputEvent_Dev::GetSelection() const { 116 std::pair<uint32_t, uint32_t> IMEInputEvent_Dev::GetSelection() const {
67 std::pair<uint32_t, uint32_t> range(0, 0); 117 std::pair<uint32_t, uint32_t> range(0, 0);
68 if (!has_interface<PPB_IMEInputEvent_Dev>()) 118 if (has_interface<PPB_IMEInputEvent_Dev_0_2>()) {
69 return range; 119 get_interface<PPB_IMEInputEvent_Dev_0_2>()->GetSelection(pp_resource(),
70 get_interface<PPB_IMEInputEvent_Dev>()->GetSelection(pp_resource(), 120 &range.first,
71 &range.first, 121 &range.second);
72 &range.second); 122 } else if (has_interface<PPB_IMEInputEvent_Dev_0_1>()) {
123 get_interface<PPB_IMEInputEvent_Dev_0_1>()->GetSelection(pp_resource(),
124 &range.first,
125 &range.second);
126 }
73 return range; 127 return range;
74 } 128 }
75 129
76 130
77 } // namespace pp 131 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/cpp/dev/ime_input_event_dev.h ('k') | ppapi/ppapi_sources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698