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

Side by Side Diff: content/renderer/pepper/event_conversion_unittest.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer/pepper/event_conversion.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6 8
9 #include <memory>
10
7 #include "base/logging.h" 11 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h"
9 #include "content/common/input/synthetic_web_input_event_builders.h" 12 #include "content/common/input/synthetic_web_input_event_builders.h"
10 #include "content/renderer/pepper/event_conversion.h"
11 #include "ppapi/shared_impl/ppb_input_event_shared.h" 13 #include "ppapi/shared_impl/ppb_input_event_shared.h"
12 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
13 15
14 namespace content { 16 namespace content {
15 17
16 class EventConversionTest : public ::testing::Test { 18 class EventConversionTest : public ::testing::Test {
17 protected: 19 protected:
18 void CompareWebTouchEvents(const blink::WebTouchEvent& expected, 20 void CompareWebTouchEvents(const blink::WebTouchEvent& expected,
19 const blink::WebTouchEvent& actual) { 21 const blink::WebTouchEvent& actual) {
20 EXPECT_EQ(expected.type, actual.type); 22 EXPECT_EQ(expected.type, actual.type);
(...skipping 25 matching lines...) Expand all
46 std::vector<ppapi::InputEventData> pp_events; 48 std::vector<ppapi::InputEventData> pp_events;
47 CreateInputEventData(touch, &pp_events); 49 CreateInputEventData(touch, &pp_events);
48 ASSERT_EQ(1U, pp_events.size()); 50 ASSERT_EQ(1U, pp_events.size());
49 51
50 const ppapi::InputEventData& pp_event = pp_events[0]; 52 const ppapi::InputEventData& pp_event = pp_events[0];
51 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHSTART, pp_event.event_type); 53 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHSTART, pp_event.event_type);
52 ASSERT_EQ(1U, pp_event.touches.size()); 54 ASSERT_EQ(1U, pp_event.touches.size());
53 ASSERT_EQ(1U, pp_event.changed_touches.size()); 55 ASSERT_EQ(1U, pp_event.changed_touches.size());
54 ASSERT_EQ(1U, pp_event.target_touches.size()); 56 ASSERT_EQ(1U, pp_event.target_touches.size());
55 57
56 scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event)); 58 std::unique_ptr<blink::WebInputEvent> event_out(
59 CreateWebInputEvent(pp_event));
57 const blink::WebTouchEvent* touch_out = 60 const blink::WebTouchEvent* touch_out =
58 static_cast<const blink::WebTouchEvent*>(event_out.get()); 61 static_cast<const blink::WebTouchEvent*>(event_out.get());
59 ASSERT_TRUE(touch_out); 62 ASSERT_TRUE(touch_out);
60 EXPECT_EQ(touch.type, touch_out->type); 63 EXPECT_EQ(touch.type, touch_out->type);
61 EXPECT_EQ(touch.touchesLength, touch_out->touchesLength); 64 EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
62 CompareWebTouchEvents(touch, *touch_out); 65 CompareWebTouchEvents(touch, *touch_out);
63 } 66 }
64 67
65 TEST_F(EventConversionTest, TouchMove) { 68 TEST_F(EventConversionTest, TouchMove) {
66 SyntheticWebTouchEvent touch; 69 SyntheticWebTouchEvent touch;
67 touch.PressPoint(1.f, 2.f); 70 touch.PressPoint(1.f, 2.f);
68 touch.ResetPoints(); 71 touch.ResetPoints();
69 touch.PressPoint(3.f, 4.f); 72 touch.PressPoint(3.f, 4.f);
70 touch.ResetPoints(); 73 touch.ResetPoints();
71 touch.MovePoint(1, 5.f, 6.f); 74 touch.MovePoint(1, 5.f, 6.f);
72 75
73 std::vector<ppapi::InputEventData> pp_events; 76 std::vector<ppapi::InputEventData> pp_events;
74 CreateInputEventData(touch, &pp_events); 77 CreateInputEventData(touch, &pp_events);
75 ASSERT_EQ(1U, pp_events.size()); 78 ASSERT_EQ(1U, pp_events.size());
76 79
77 const ppapi::InputEventData& pp_event = pp_events[0]; 80 const ppapi::InputEventData& pp_event = pp_events[0];
78 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHMOVE, pp_event.event_type); 81 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHMOVE, pp_event.event_type);
79 ASSERT_EQ(2U, pp_event.touches.size()); 82 ASSERT_EQ(2U, pp_event.touches.size());
80 ASSERT_EQ(1U, pp_event.changed_touches.size()); 83 ASSERT_EQ(1U, pp_event.changed_touches.size());
81 ASSERT_EQ(2U, pp_event.target_touches.size()); 84 ASSERT_EQ(2U, pp_event.target_touches.size());
82 85
83 scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event)); 86 std::unique_ptr<blink::WebInputEvent> event_out(
87 CreateWebInputEvent(pp_event));
84 const blink::WebTouchEvent* touch_out = 88 const blink::WebTouchEvent* touch_out =
85 static_cast<const blink::WebTouchEvent*>(event_out.get()); 89 static_cast<const blink::WebTouchEvent*>(event_out.get());
86 ASSERT_TRUE(touch_out); 90 ASSERT_TRUE(touch_out);
87 EXPECT_EQ(touch.type, touch_out->type); 91 EXPECT_EQ(touch.type, touch_out->type);
88 EXPECT_EQ(touch.touchesLength, touch_out->touchesLength); 92 EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
89 CompareWebTouchEvents(touch, *touch_out); 93 CompareWebTouchEvents(touch, *touch_out);
90 } 94 }
91 95
92 TEST_F(EventConversionTest, TouchEnd) { 96 TEST_F(EventConversionTest, TouchEnd) {
93 SyntheticWebTouchEvent touch; 97 SyntheticWebTouchEvent touch;
94 touch.PressPoint(1.f, 2.f); 98 touch.PressPoint(1.f, 2.f);
95 touch.ResetPoints(); 99 touch.ResetPoints();
96 touch.PressPoint(3.f, 4.f); 100 touch.PressPoint(3.f, 4.f);
97 touch.ResetPoints(); 101 touch.ResetPoints();
98 touch.ReleasePoint(0); 102 touch.ReleasePoint(0);
99 103
100 std::vector<ppapi::InputEventData> pp_events; 104 std::vector<ppapi::InputEventData> pp_events;
101 CreateInputEventData(touch, &pp_events); 105 CreateInputEventData(touch, &pp_events);
102 ASSERT_EQ(1U, pp_events.size()); 106 ASSERT_EQ(1U, pp_events.size());
103 107
104 const ppapi::InputEventData& pp_event = pp_events[0]; 108 const ppapi::InputEventData& pp_event = pp_events[0];
105 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHEND, pp_event.event_type); 109 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHEND, pp_event.event_type);
106 ASSERT_EQ(1U, pp_event.touches.size()); 110 ASSERT_EQ(1U, pp_event.touches.size());
107 ASSERT_EQ(1U, pp_event.changed_touches.size()); 111 ASSERT_EQ(1U, pp_event.changed_touches.size());
108 ASSERT_EQ(2U, pp_event.target_touches.size()); 112 ASSERT_EQ(2U, pp_event.target_touches.size());
109 113
110 scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event)); 114 std::unique_ptr<blink::WebInputEvent> event_out(
115 CreateWebInputEvent(pp_event));
111 const blink::WebTouchEvent* touch_out = 116 const blink::WebTouchEvent* touch_out =
112 static_cast<const blink::WebTouchEvent*>(event_out.get()); 117 static_cast<const blink::WebTouchEvent*>(event_out.get());
113 ASSERT_TRUE(touch_out); 118 ASSERT_TRUE(touch_out);
114 EXPECT_EQ(touch.type, touch_out->type); 119 EXPECT_EQ(touch.type, touch_out->type);
115 ASSERT_EQ(touch.touchesLength, touch_out->touchesLength); 120 ASSERT_EQ(touch.touchesLength, touch_out->touchesLength);
116 CompareWebTouchEvents(touch, *touch_out); 121 CompareWebTouchEvents(touch, *touch_out);
117 } 122 }
118 123
119 TEST_F(EventConversionTest, TouchCancel) { 124 TEST_F(EventConversionTest, TouchCancel) {
120 SyntheticWebTouchEvent touch; 125 SyntheticWebTouchEvent touch;
121 touch.PressPoint(1.f, 2.f); 126 touch.PressPoint(1.f, 2.f);
122 touch.ResetPoints(); 127 touch.ResetPoints();
123 touch.PressPoint(3.f, 4.f); 128 touch.PressPoint(3.f, 4.f);
124 touch.ResetPoints(); 129 touch.ResetPoints();
125 touch.CancelPoint(1); 130 touch.CancelPoint(1);
126 touch.CancelPoint(0); 131 touch.CancelPoint(0);
127 132
128 std::vector<ppapi::InputEventData> pp_events; 133 std::vector<ppapi::InputEventData> pp_events;
129 CreateInputEventData(touch, &pp_events); 134 CreateInputEventData(touch, &pp_events);
130 ASSERT_EQ(1U, pp_events.size()); 135 ASSERT_EQ(1U, pp_events.size());
131 136
132 const ppapi::InputEventData& pp_event = pp_events[0]; 137 const ppapi::InputEventData& pp_event = pp_events[0];
133 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHCANCEL, pp_event.event_type); 138 ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHCANCEL, pp_event.event_type);
134 ASSERT_EQ(0U, pp_event.touches.size()); 139 ASSERT_EQ(0U, pp_event.touches.size());
135 ASSERT_EQ(2U, pp_event.changed_touches.size()); 140 ASSERT_EQ(2U, pp_event.changed_touches.size());
136 ASSERT_EQ(2U, pp_event.target_touches.size()); 141 ASSERT_EQ(2U, pp_event.target_touches.size());
137 142
138 scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event)); 143 std::unique_ptr<blink::WebInputEvent> event_out(
144 CreateWebInputEvent(pp_event));
139 const blink::WebTouchEvent* touch_out = 145 const blink::WebTouchEvent* touch_out =
140 static_cast<const blink::WebTouchEvent*>(event_out.get()); 146 static_cast<const blink::WebTouchEvent*>(event_out.get());
141 ASSERT_TRUE(touch_out); 147 ASSERT_TRUE(touch_out);
142 EXPECT_EQ(touch.type, touch_out->type); 148 EXPECT_EQ(touch.type, touch_out->type);
143 EXPECT_EQ(touch.touchesLength, touch_out->touchesLength); 149 EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
144 CompareWebTouchEvents(touch, *touch_out); 150 CompareWebTouchEvents(touch, *touch_out);
145 } 151 }
146 152
147 } // namespace content 153 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/event_conversion.cc ('k') | content/renderer/pepper/host_array_buffer_var.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698