Commit e3882158 authored by chaopeng's avatar chaopeng Committed by Commit Bot

Set default value to ScrollEvent scroll_event_phase_

This patch is for set the scroll_event_phase_ kNone as default
in ctor. It hits DCHECK in MakeWebMouseWheelEventFromUiEvent()
if the field not set.

Bug: 647140

Change-Id: I3fd523bd84788957d0d05770fa70503be619e4ad
Reviewed-on: https://chromium-review.googlesource.com/998755Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Jianpeng Chao <chaopeng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548681}
parent 0c9503aa
......@@ -1405,7 +1405,8 @@ ScrollEvent::ScrollEvent(const PlatformEvent& native_event)
x_offset_ordinal_(0.0f),
y_offset_ordinal_(0.0f),
finger_count_(0),
momentum_phase_(EventMomentumPhase::NONE) {
momentum_phase_(EventMomentumPhase::NONE),
scroll_event_phase_(ScrollEventPhase::kNone) {
if (type() == ET_SCROLL) {
GetScrollOffsets(native_event, &x_offset_, &y_offset_, &x_offset_ordinal_,
&y_offset_ordinal_, &finger_count_, &momentum_phase_);
......
......@@ -993,16 +993,15 @@ class EVENTS_EXPORT ScrollEvent : public MouseEvent {
public:
explicit ScrollEvent(const PlatformEvent& native_event);
template <class T>
ScrollEvent(const ScrollEvent& model,
T* source,
T* target)
ScrollEvent(const ScrollEvent& model, T* source, T* target)
: MouseEvent(model, source, target),
x_offset_(model.x_offset_),
y_offset_(model.y_offset_),
x_offset_ordinal_(model.x_offset_ordinal_),
y_offset_ordinal_(model.y_offset_ordinal_),
finger_count_(model.finger_count_){
}
finger_count_(model.finger_count_),
momentum_phase_(model.momentum_phase_),
scroll_event_phase_(model.scroll_event_phase_) {}
ScrollEvent(EventType type,
const gfx::Point& location,
......@@ -1044,10 +1043,10 @@ class EVENTS_EXPORT ScrollEvent : public MouseEvent {
// For non-fling events, provides momentum information (e.g. for the case
// where the device provides continuous event updates during a fling).
EventMomentumPhase momentum_phase_;
EventMomentumPhase momentum_phase_ = EventMomentumPhase::NONE;
// Provides phase information if device can provide.
ScrollEventPhase scroll_event_phase_;
ScrollEventPhase scroll_event_phase_ = ScrollEventPhase::kNone;
};
class EVENTS_EXPORT GestureEvent : public LocatedEvent {
......
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