| Index: ui/events/blink/web_input_event_traits.cc
|
| diff --git a/ui/events/blink/web_input_event_traits.cc b/ui/events/blink/web_input_event_traits.cc
|
| index dddf765967e0f70244e74fbff46b3a9624a94adb..02dbaada78ec5eacd28e63c817fd4abcce17677d 100644
|
| --- a/ui/events/blink/web_input_event_traits.cc
|
| +++ b/ui/events/blink/web_input_event_traits.cc
|
| @@ -129,25 +129,14 @@ struct WebInputEventSize {
|
| struct WebInputEventClone {
|
| template <class EventType>
|
| bool Execute(const WebInputEvent& event,
|
| - ScopedWebInputEvent* scoped_event) const {
|
| + blink::WebScopedInputEvent* scoped_event) const {
|
| DCHECK_EQ(sizeof(EventType), event.size);
|
| - *scoped_event = ScopedWebInputEvent(
|
| + *scoped_event = blink::WebScopedInputEvent(
|
| new EventType(static_cast<const EventType&>(event)));
|
| return true;
|
| }
|
| };
|
|
|
| -struct WebInputEventDelete {
|
| - template <class EventType>
|
| - bool Execute(WebInputEvent* event, bool* /* dummy_var */) const {
|
| - if (!event)
|
| - return false;
|
| - DCHECK_EQ(sizeof(EventType), event->size);
|
| - delete static_cast<EventType*>(event);
|
| - return true;
|
| - }
|
| -};
|
| -
|
| template <typename Operator, typename ArgIn, typename ArgOut>
|
| bool Apply(Operator op,
|
| WebInputEvent::Type type,
|
| @@ -182,19 +171,13 @@ size_t WebInputEventTraits::GetSize(WebInputEvent::Type type) {
|
| return size;
|
| }
|
|
|
| -ScopedWebInputEvent WebInputEventTraits::Clone(const WebInputEvent& event) {
|
| - ScopedWebInputEvent scoped_event;
|
| +blink::WebScopedInputEvent WebInputEventTraits::Clone(
|
| + const WebInputEvent& event) {
|
| + blink::WebScopedInputEvent scoped_event;
|
| Apply(WebInputEventClone(), event.type, event, &scoped_event);
|
| return scoped_event;
|
| }
|
|
|
| -void WebInputEventTraits::Delete(WebInputEvent* event) {
|
| - if (!event)
|
| - return;
|
| - bool dummy_var = false;
|
| - Apply(WebInputEventDelete(), event->type, event, &dummy_var);
|
| -}
|
| -
|
| bool WebInputEventTraits::ShouldBlockEventStream(const WebInputEvent& event) {
|
| switch (event.type) {
|
| case WebInputEvent::MouseDown:
|
|
|