| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2104 } | 2104 } |
| 2105 if (event->type() == ui::ET_SCROLL_FLING_START) | 2105 if (event->type() == ui::ET_SCROLL_FLING_START) |
| 2106 RecordAction(base::UserMetricsAction("TrackpadScrollFling")); | 2106 RecordAction(base::UserMetricsAction("TrackpadScrollFling")); |
| 2107 } | 2107 } |
| 2108 | 2108 |
| 2109 event->SetHandled(); | 2109 event->SetHandled(); |
| 2110 } | 2110 } |
| 2111 | 2111 |
| 2112 void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { | 2112 void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { |
| 2113 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnTouchEvent"); | 2113 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnTouchEvent"); |
| 2114 | 2114 VLOG(0) << "RenderWidgetHostViewAura::OnTouchEvent: " << event->type(); |
| 2115 bool had_no_pointer = !pointer_state_.GetPointerCount(); | 2115 bool had_no_pointer = !pointer_state_.GetPointerCount(); |
| 2116 | 2116 |
| 2117 // Update the touch event first. | 2117 // Update the touch event first. |
| 2118 if (!pointer_state_.OnTouch(*event)) { | 2118 if (!pointer_state_.OnTouch(*event)) { |
| 2119 event->StopPropagation(); | 2119 event->StopPropagation(); |
| 2120 return; | 2120 return; |
| 2121 } | 2121 } |
| 2122 | 2122 |
| 2123 blink::WebTouchEvent touch_event; | 2123 blink::WebTouchEvent touch_event; |
| 2124 bool handled = selection_controller_->WillHandleTouchEvent(pointer_state_); | 2124 bool handled = selection_controller_->WillHandleTouchEvent(pointer_state_); |
| (...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3052 return; | 3052 return; |
| 3053 } | 3053 } |
| 3054 | 3054 |
| 3055 // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard. | 3055 // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard. |
| 3056 ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION); | 3056 ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION); |
| 3057 clipboard_writer.WriteText(text_selection->text.substr(pos, n)); | 3057 clipboard_writer.WriteText(text_selection->text.substr(pos, n)); |
| 3058 #endif // defined(USE_X11) && !defined(OS_CHROMEOS) | 3058 #endif // defined(USE_X11) && !defined(OS_CHROMEOS) |
| 3059 } | 3059 } |
| 3060 | 3060 |
| 3061 } // namespace content | 3061 } // namespace content |
| OLD | NEW |