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

Side by Side Diff: content/renderer/render_widget_unittest.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-gfx: . Created 5 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "content/common/input/synthetic_web_input_event_builders.h" 9 #include "content/common/input/synthetic_web_input_event_builders.h"
10 #include "content/common/input_messages.h" 10 #include "content/common/input_messages.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 const IPC::Message* message = widget()->sink()->GetMessageAt(0); 184 const IPC::Message* message = widget()->sink()->GetMessageAt(0);
185 ASSERT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); 185 ASSERT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type());
186 InputHostMsg_HandleInputEvent_ACK::Param params; 186 InputHostMsg_HandleInputEvent_ACK::Param params;
187 InputHostMsg_HandleInputEvent_ACK::Read(message, &params); 187 InputHostMsg_HandleInputEvent_ACK::Read(message, &params);
188 const InputEventAck& ack = base::get<0>(params); 188 const InputEventAck& ack = base::get<0>(params);
189 ASSERT_EQ(ack.type, scroll.type); 189 ASSERT_EQ(ack.type, scroll.type);
190 ASSERT_TRUE(ack.overscroll); 190 ASSERT_TRUE(ack.overscroll);
191 EXPECT_EQ(gfx::Vector2dF(0, 10), ack.overscroll->accumulated_overscroll); 191 EXPECT_EQ(gfx::Vector2dF(0, 10), ack.overscroll->accumulated_overscroll);
192 EXPECT_EQ(gfx::Vector2dF(0, 10), ack.overscroll->latest_overscroll_delta); 192 EXPECT_EQ(gfx::Vector2dF(0, 10), ack.overscroll->latest_overscroll_delta);
193 EXPECT_EQ(gfx::Vector2dF(), ack.overscroll->current_fling_velocity); 193 EXPECT_EQ(gfx::Vector2dF(), ack.overscroll->current_fling_velocity);
194 EXPECT_EQ(gfx::PointF(-10, 0), ack.overscroll->causal_event_viewport_point); 194 EXPECT_EQ(gfx::Point(-10, 0), ack.overscroll->causal_event_viewport_point);
195 widget()->sink()->ClearMessages(); 195 widget()->sink()->ClearMessages();
196 } 196 }
197 197
198 TEST_F(RenderWidgetUnittest, FlingOverscroll) { 198 TEST_F(RenderWidgetUnittest, FlingOverscroll) {
199 // Overscroll notifications received outside of handling an input event should 199 // Overscroll notifications received outside of handling an input event should
200 // be sent as a separate IPC. 200 // be sent as a separate IPC.
201 widget()->didOverscroll(blink::WebFloatSize(10, 5), blink::WebFloatSize(5, 5), 201 widget()->didOverscroll(blink::WebFloatSize(10, 5), blink::WebFloatSize(5, 5),
202 blink::WebFloatPoint(1, 1), 202 blink::WebFloatPoint(1, 1),
203 blink::WebFloatSize(10, 5)); 203 blink::WebFloatSize(10, 5));
204 ASSERT_EQ(1u, widget()->sink()->message_count()); 204 ASSERT_EQ(1u, widget()->sink()->message_count());
205 const IPC::Message* message = widget()->sink()->GetMessageAt(0); 205 const IPC::Message* message = widget()->sink()->GetMessageAt(0);
206 ASSERT_EQ(InputHostMsg_DidOverscroll::ID, message->type()); 206 ASSERT_EQ(InputHostMsg_DidOverscroll::ID, message->type());
207 InputHostMsg_DidOverscroll::Param params; 207 InputHostMsg_DidOverscroll::Param params;
208 InputHostMsg_DidOverscroll::Read(message, &params); 208 InputHostMsg_DidOverscroll::Read(message, &params);
209 const DidOverscrollParams& overscroll = base::get<0>(params); 209 const DidOverscrollParams& overscroll = base::get<0>(params);
210 EXPECT_EQ(gfx::Vector2dF(10, 5), overscroll.latest_overscroll_delta); 210 EXPECT_EQ(gfx::Vector2dF(10, 5), overscroll.latest_overscroll_delta);
211 EXPECT_EQ(gfx::Vector2dF(5, 5), overscroll.accumulated_overscroll); 211 EXPECT_EQ(gfx::Vector2dF(5, 5), overscroll.accumulated_overscroll);
212 EXPECT_EQ(gfx::PointF(1, 1), overscroll.causal_event_viewport_point); 212 EXPECT_EQ(gfx::Point(1, 1), overscroll.causal_event_viewport_point);
213 EXPECT_EQ(gfx::Vector2dF(-10, -5), overscroll.current_fling_velocity); 213 EXPECT_EQ(gfx::Vector2dF(-10, -5), overscroll.current_fling_velocity);
214 widget()->sink()->ClearMessages(); 214 widget()->sink()->ClearMessages();
215 } 215 }
216 216
217 } // namespace content 217 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698