OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "cc/trees/layer_tree_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 | 411 |
412 target_tree->RegisterSelection(selection_); | 412 target_tree->RegisterSelection(selection_); |
413 | 413 |
414 // This should match the property synchronization in | 414 // This should match the property synchronization in |
415 // LayerTreeHost::finishCommitOnImplThread(). | 415 // LayerTreeHost::finishCommitOnImplThread(). |
416 target_tree->set_source_frame_number(source_frame_number()); | 416 target_tree->set_source_frame_number(source_frame_number()); |
417 target_tree->set_background_color(background_color()); | 417 target_tree->set_background_color(background_color()); |
418 target_tree->set_has_transparent_background(has_transparent_background()); | 418 target_tree->set_has_transparent_background(has_transparent_background()); |
419 target_tree->set_have_scroll_event_handlers(have_scroll_event_handlers()); | 419 target_tree->set_have_scroll_event_handlers(have_scroll_event_handlers()); |
420 target_tree->set_event_listener_properties( | 420 target_tree->set_event_listener_properties( |
421 EventListenerClass::kTouch, | 421 EventListenerClass::kTouchStartOrMove, |
422 event_listener_properties(EventListenerClass::kTouch)); | 422 event_listener_properties(EventListenerClass::kTouchStartOrMove)); |
423 target_tree->set_event_listener_properties( | 423 target_tree->set_event_listener_properties( |
424 EventListenerClass::kMouseWheel, | 424 EventListenerClass::kMouseWheel, |
425 event_listener_properties(EventListenerClass::kMouseWheel)); | 425 event_listener_properties(EventListenerClass::kMouseWheel)); |
| 426 target_tree->set_event_listener_properties( |
| 427 EventListenerClass::kTouchEndOrCancel, |
| 428 event_listener_properties(EventListenerClass::kTouchEndOrCancel)); |
426 | 429 |
427 if (ViewportSizeInvalid()) | 430 if (ViewportSizeInvalid()) |
428 target_tree->SetViewportSizeInvalid(); | 431 target_tree->SetViewportSizeInvalid(); |
429 else | 432 else |
430 target_tree->ResetViewportSizeInvalid(); | 433 target_tree->ResetViewportSizeInvalid(); |
431 | 434 |
432 if (hud_layer()) | 435 if (hud_layer()) |
433 target_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>( | 436 target_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>( |
434 target_tree->LayerById(hud_layer()->id()))); | 437 target_tree->LayerById(hud_layer()->id()))); |
435 else | 438 else |
(...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2101 } | 2104 } |
2102 | 2105 |
2103 void LayerTreeImpl::ResetAllChangeTracking(PropertyTrees::ResetFlags flag) { | 2106 void LayerTreeImpl::ResetAllChangeTracking(PropertyTrees::ResetFlags flag) { |
2104 layers_that_should_push_properties_.clear(); | 2107 layers_that_should_push_properties_.clear(); |
2105 for (auto* layer : *this) | 2108 for (auto* layer : *this) |
2106 layer->ResetChangeTracking(); | 2109 layer->ResetChangeTracking(); |
2107 property_trees_.ResetAllChangeTracking(flag); | 2110 property_trees_.ResetAllChangeTracking(flag); |
2108 } | 2111 } |
2109 | 2112 |
2110 } // namespace cc | 2113 } // namespace cc |
OLD | NEW |