| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind_helpers.h" | 5 #include "base/bind_helpers.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/browser/browser_plugin/browser_plugin_guest.h" | 9 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
| 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 return; | 138 return; |
| 139 | 139 |
| 140 ui::EventResult result = (ack_result == | 140 ui::EventResult result = (ack_result == |
| 141 INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; | 141 INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; |
| 142 for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), | 142 for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), |
| 143 end = events.end(); iter != end; ++iter) { | 143 end = events.end(); iter != end; ++iter) { |
| 144 if (!gesture_recognizer_->ProcessTouchEventPreDispatch(*(*iter), this)) | 144 if (!gesture_recognizer_->ProcessTouchEventPreDispatch(*(*iter), this)) |
| 145 continue; | 145 continue; |
| 146 | 146 |
| 147 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; | 147 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; |
| 148 gestures.reset(gesture_recognizer_->ProcessTouchEventPostDispatch( | 148 gestures.reset(gesture_recognizer_->AckSyncTouchEvent( |
| 149 *(*iter), result, this)); | 149 *(*iter), result, this)); |
| 150 ProcessGestures(gestures.get()); | 150 ProcessGestures(gestures.get()); |
| 151 } | 151 } |
| 152 } | 152 } |
| 153 #endif | 153 #endif |
| 154 | 154 |
| 155 gfx::Rect RenderWidgetHostViewGuest::GetViewBounds() const { | 155 gfx::Rect RenderWidgetHostViewGuest::GetViewBounds() const { |
| 156 if (!guest_) | 156 if (!guest_) |
| 157 return gfx::Rect(); | 157 return gfx::Rect(); |
| 158 | 158 |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 } | 585 } |
| 586 | 586 |
| 587 if (blink::WebInputEvent::isGestureEventType(event->type)) { | 587 if (blink::WebInputEvent::isGestureEventType(event->type)) { |
| 588 host_->ForwardGestureEvent( | 588 host_->ForwardGestureEvent( |
| 589 *static_cast<const blink::WebGestureEvent*>(event)); | 589 *static_cast<const blink::WebGestureEvent*>(event)); |
| 590 return; | 590 return; |
| 591 } | 591 } |
| 592 } | 592 } |
| 593 | 593 |
| 594 } // namespace content | 594 } // namespace content |
| OLD | NEW |