| Index: ui/base/event.cc
|
| ===================================================================
|
| --- ui/base/event.cc (revision 150582)
|
| +++ ui/base/event.cc (working copy)
|
| @@ -106,6 +106,12 @@
|
| root_location_(root_location) {
|
| }
|
|
|
| +LocatedEvent::LocatedEvent(const LocatedEvent& model)
|
| + : Event(model),
|
| + location_(model.location_),
|
| + root_location_(model.root_location_) {
|
| +}
|
| +
|
| void LocatedEvent::UpdateForRootTransform(const Transform& root_transform) {
|
| // Transform has to be done at root level.
|
| DCHECK_EQ(root_location_.x(), location_.x());
|
| @@ -168,7 +174,7 @@
|
| click_count = last_click_event_->GetClickCount() + 1;
|
| delete last_click_event_;
|
| }
|
| - last_click_event_ = new MouseEvent(event.native_event());
|
| + last_click_event_ = new MouseEvent(event);
|
| if (click_count > 3)
|
| click_count = 3;
|
| last_click_event_->SetClickCount(click_count);
|
| @@ -215,6 +221,9 @@
|
| set_flags(f);
|
| }
|
|
|
| +MouseEvent::MouseEvent(const MouseEvent& model) : LocatedEvent(model) {
|
| +}
|
| +
|
| TouchEventImpl::TouchEventImpl(const base::NativeEvent& native_event)
|
| : LocatedEvent(native_event),
|
| touch_id_(ui::GetTouchId(native_event)),
|
|
|