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

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

Issue 676953003: cc: Always keep the PictureLayerImpl::twin_layer_ pointer valid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: twins: add-test-case Created 6 years, 1 month 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
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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 return tree->LayerById(id); 740 return tree->LayerById(id);
741 } 741 }
742 742
743 LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) { 743 LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) {
744 LayerTreeImpl* tree = layer_tree_host_impl_->pending_tree(); 744 LayerTreeImpl* tree = layer_tree_host_impl_->pending_tree();
745 if (!tree) 745 if (!tree)
746 return NULL; 746 return NULL;
747 return tree->LayerById(id); 747 return tree->LayerById(id);
748 } 748 }
749 749
750 LayerImpl* LayerTreeImpl::FindRecycleTreeLayerById(int id) {
751 LayerTreeImpl* tree = layer_tree_host_impl_->recycle_tree();
752 if (!tree)
753 return NULL;
754 return tree->LayerById(id);
755 }
756
757 bool LayerTreeImpl::PinchGestureActive() const { 750 bool LayerTreeImpl::PinchGestureActive() const {
758 return layer_tree_host_impl_->pinch_gesture_active(); 751 return layer_tree_host_impl_->pinch_gesture_active();
759 } 752 }
760 753
761 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const { 754 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const {
762 return layer_tree_host_impl_->CurrentBeginFrameArgs(); 755 return layer_tree_host_impl_->CurrentBeginFrameArgs();
763 } 756 }
764 757
765 base::TimeDelta LayerTreeImpl::begin_impl_frame_interval() const { 758 base::TimeDelta LayerTreeImpl::begin_impl_frame_interval() const {
766 return layer_tree_host_impl_->begin_impl_frame_interval(); 759 return layer_tree_host_impl_->begin_impl_frame_interval();
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1515 page_scale, 1508 page_scale,
1516 duration.InSecondsF()); 1509 duration.InSecondsF());
1517 } 1510 }
1518 } 1511 }
1519 1512
1520 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { 1513 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() {
1521 return page_scale_animation_.Pass(); 1514 return page_scale_animation_.Pass();
1522 } 1515 }
1523 1516
1524 } // namespace cc 1517 } // namespace cc
OLDNEW
« cc/trees/layer_tree_host_impl_unittest.cc ('K') | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698