Commit 3c5babb1 authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix incorrect types and 64 bit truncations in core/events

PointerEvent's types didn't match the IDL definitions.
Use wtf_size_t when iterating WTF types.

BUG=588506

Change-Id: Ic208216e5559f3eb43d90f95712b45b22d38dd2f
Reviewed-on: https://chromium-review.googlesource.com/1227143Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591435}
parent 257da028
......@@ -36,7 +36,7 @@
namespace blink {
long NavigatorEvents::maxTouchPoints(Navigator& navigator) {
int32_t NavigatorEvents::maxTouchPoints(Navigator& navigator) {
LocalFrame* frame = navigator.GetFrame();
if (!frame)
return 0;
......
......@@ -41,7 +41,7 @@ class NavigatorEvents {
STATIC_ONLY(NavigatorEvents);
public:
static long maxTouchPoints(Navigator&);
static int32_t maxTouchPoints(Navigator&);
};
} // namespace blink
......
......@@ -24,14 +24,14 @@ class CORE_EXPORT PointerEvent final : public MouseEvent {
return PointerEvent::Create(type, initializer, CurrentTimeTicks());
}
int pointerId() const { return pointer_id_; }
int32_t pointerId() const { return pointer_id_; }
double width() const { return width_; }
double height() const { return height_; }
float pressure() const { return pressure_; }
long tiltX() const { return tilt_x_; }
long tiltY() const { return tilt_y_; }
int32_t tiltX() const { return tilt_x_; }
int32_t tiltY() const { return tilt_y_; }
float tangentialPressure() const { return tangential_pressure_; }
long twist() const { return twist_; }
int32_t twist() const { return twist_; }
const String& pointerType() const { return pointer_type_; }
bool isPrimary() const { return is_primary_; }
......@@ -70,14 +70,14 @@ class CORE_EXPORT PointerEvent final : public MouseEvent {
const PointerEventInit&,
TimeTicks platform_time_stamp);
int pointer_id_;
int32_t pointer_id_;
double width_;
double height_;
float pressure_;
long tilt_x_;
long tilt_y_;
int32_t tilt_x_;
int32_t tilt_y_;
float tangential_pressure_;
long twist_;
int32_t twist_;
String pointer_type_;
bool is_primary_;
......
......@@ -53,7 +53,7 @@ class PointerEventFactoryTest : public testing::Test {
WebInputEvent::Type type = WebInputEvent::kPointerDown,
WebPointerProperties::Button button =
WebPointerProperties::Button::kNoButton,
size_t coalesced_event_count = 0) {
wtf_size_t coalesced_event_count = 0) {
WebPointerEvent web_pointer_event;
web_pointer_event.pointer_type = pointer_type;
web_pointer_event.id = raw_id;
......@@ -64,7 +64,7 @@ class PointerEventFactoryTest : public testing::Test {
web_pointer_event.hovering = hovering;
web_pointer_event.button = button;
Vector<WebPointerEvent> coalesced_events;
for (size_t i = 0; i < coalesced_event_count; i++) {
for (wtf_size_t i = 0; i < coalesced_event_count; i++) {
coalesced_events.push_back(web_pointer_event);
}
PointerEvent* pointer_event = pointer_event_factory_.Create(
......@@ -78,7 +78,7 @@ class PointerEventFactoryTest : public testing::Test {
EXPECT_EQ(expected_pointer_type, pointer_event->pointerType());
EXPECT_EQ(coalesced_event_count,
pointer_event->getCoalescedEvents().size());
for (size_t i = 0; i < coalesced_event_count; i++) {
for (wtf_size_t i = 0; i < coalesced_event_count; i++) {
EXPECT_EQ(unique_id, pointer_event->getCoalescedEvents()[i]->pointerId());
EXPECT_EQ(is_primary,
pointer_event->getCoalescedEvents()[i]->isPrimary());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment