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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <tuple> | 10 #include <tuple> |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 bool should_capture_; | 338 bool should_capture_; |
339 base::UnguessableToken source_id_for_copy_request_; | 339 base::UnguessableToken source_id_for_copy_request_; |
340 }; | 340 }; |
341 | 341 |
342 class FakeWindowEventDispatcher : public aura::WindowEventDispatcher { | 342 class FakeWindowEventDispatcher : public aura::WindowEventDispatcher { |
343 public: | 343 public: |
344 FakeWindowEventDispatcher(aura::WindowTreeHost* host) | 344 FakeWindowEventDispatcher(aura::WindowTreeHost* host) |
345 : WindowEventDispatcher(host), | 345 : WindowEventDispatcher(host), |
346 processed_touch_event_count_(0) {} | 346 processed_touch_event_count_(0) {} |
347 | 347 |
348 void ProcessedTouchEvent(uint32_t unique_event_id, | 348 void ProcessedTouchEvent( |
349 aura::Window* window, | 349 uint32_t unique_event_id, |
350 ui::EventResult result) override { | 350 aura::Window* window, |
351 WindowEventDispatcher::ProcessedTouchEvent(unique_event_id, window, result); | 351 ui::EventResult result, |
| 352 bool is_source_touch_event_set_non_blocking) override { |
| 353 WindowEventDispatcher::ProcessedTouchEvent( |
| 354 unique_event_id, window, result, |
| 355 is_source_touch_event_set_non_blocking); |
352 processed_touch_event_count_++; | 356 processed_touch_event_count_++; |
353 } | 357 } |
354 | 358 |
355 size_t GetAndResetProcessedTouchEventCount() { | 359 size_t GetAndResetProcessedTouchEventCount() { |
356 size_t count = processed_touch_event_count_; | 360 size_t count = processed_touch_event_count_; |
357 processed_touch_event_count_ = 0; | 361 processed_touch_event_count_ = 0; |
358 return count; | 362 return count; |
359 } | 363 } |
360 | 364 |
361 private: | 365 private: |
(...skipping 5523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5885 // There is no composition in the beginning. | 5889 // There is no composition in the beginning. |
5886 EXPECT_FALSE(has_composition_text()); | 5890 EXPECT_FALSE(has_composition_text()); |
5887 SetHasCompositionTextToTrue(); | 5891 SetHasCompositionTextToTrue(); |
5888 view->ImeCancelComposition(); | 5892 view->ImeCancelComposition(); |
5889 // The composition must have been canceled. | 5893 // The composition must have been canceled. |
5890 EXPECT_FALSE(has_composition_text()); | 5894 EXPECT_FALSE(has_composition_text()); |
5891 } | 5895 } |
5892 } | 5896 } |
5893 | 5897 |
5894 } // namespace content | 5898 } // namespace content |
OLD | NEW |