Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: cc/trees/layer_tree_impl.cc

Issue 441863002: cc: Make sure mask and replica layers get DidBecomeActive signal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: +test Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <limits> 7 #include <limits>
8 #include <set> 8 #include <set>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 } 571 }
572 572
573 void LayerTreeImpl::PushPersistedState(LayerTreeImpl* pending_tree) { 573 void LayerTreeImpl::PushPersistedState(LayerTreeImpl* pending_tree) {
574 pending_tree->SetCurrentlyScrollingLayer( 574 pending_tree->SetCurrentlyScrollingLayer(
575 LayerTreeHostCommon::FindLayerInSubtree(pending_tree->root_layer(), 575 LayerTreeHostCommon::FindLayerInSubtree(pending_tree->root_layer(),
576 currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0)); 576 currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0));
577 } 577 }
578 578
579 static void DidBecomeActiveRecursive(LayerImpl* layer) { 579 static void DidBecomeActiveRecursive(LayerImpl* layer) {
580 layer->DidBecomeActive(); 580 layer->DidBecomeActive();
581 if (layer->mask_layer())
582 layer->mask_layer()->DidBecomeActive();
583 if (layer->replica_layer() && layer->replica_layer()->mask_layer())
584 layer->replica_layer()->mask_layer()->DidBecomeActive();
585
581 for (size_t i = 0; i < layer->children().size(); ++i) 586 for (size_t i = 0; i < layer->children().size(); ++i)
582 DidBecomeActiveRecursive(layer->children()[i]); 587 DidBecomeActiveRecursive(layer->children()[i]);
583 } 588 }
584 589
585 void LayerTreeImpl::DidBecomeActive() { 590 void LayerTreeImpl::DidBecomeActive() {
586 if (next_activation_forces_redraw_) { 591 if (next_activation_forces_redraw_) {
587 layer_tree_host_impl_->SetFullRootLayerDamage(); 592 layer_tree_host_impl_->SetFullRootLayerDamage();
588 next_activation_forces_redraw_ = false; 593 next_activation_forces_redraw_ = false;
589 } 594 }
590 595
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 1398
1394 void LayerTreeImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { 1399 void LayerTreeImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) {
1395 layer_tree_host_impl_->UnregisterPictureLayerImpl(layer); 1400 layer_tree_host_impl_->UnregisterPictureLayerImpl(layer);
1396 } 1401 }
1397 1402
1398 void LayerTreeImpl::InputScrollAnimationFinished() { 1403 void LayerTreeImpl::InputScrollAnimationFinished() {
1399 layer_tree_host_impl_->ScrollEnd(); 1404 layer_tree_host_impl_->ScrollEnd();
1400 } 1405 }
1401 1406
1402 } // namespace cc 1407 } // namespace cc
OLDNEW
« cc/test/fake_picture_layer_impl.h ('K') | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698