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

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: anothercheck 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
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 return tree->LayerById(id); 743 return tree->LayerById(id);
744 } 744 }
745 745
746 LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) { 746 LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) {
747 LayerTreeImpl* tree = layer_tree_host_impl_->pending_tree(); 747 LayerTreeImpl* tree = layer_tree_host_impl_->pending_tree();
748 if (!tree) 748 if (!tree)
749 return NULL; 749 return NULL;
750 return tree->LayerById(id); 750 return tree->LayerById(id);
751 } 751 }
752 752
753 LayerImpl* LayerTreeImpl::FindRecycleTreeLayerById(int id) {
754 LayerTreeImpl* tree = layer_tree_host_impl_->recycle_tree();
755 if (!tree)
756 return NULL;
757 return tree->LayerById(id);
758 }
759
760 bool LayerTreeImpl::PinchGestureActive() const { 753 bool LayerTreeImpl::PinchGestureActive() const {
761 return layer_tree_host_impl_->pinch_gesture_active(); 754 return layer_tree_host_impl_->pinch_gesture_active();
762 } 755 }
763 756
764 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const { 757 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const {
765 return layer_tree_host_impl_->CurrentBeginFrameArgs(); 758 return layer_tree_host_impl_->CurrentBeginFrameArgs();
766 } 759 }
767 760
768 base::TimeDelta LayerTreeImpl::begin_impl_frame_interval() const { 761 base::TimeDelta LayerTreeImpl::begin_impl_frame_interval() const {
769 return layer_tree_host_impl_->begin_impl_frame_interval(); 762 return layer_tree_host_impl_->begin_impl_frame_interval();
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 page_scale, 1515 page_scale,
1523 duration.InSecondsF()); 1516 duration.InSecondsF());
1524 } 1517 }
1525 } 1518 }
1526 1519
1527 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { 1520 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() {
1528 return page_scale_animation_.Pass(); 1521 return page_scale_animation_.Pass();
1529 } 1522 }
1530 1523
1531 } // namespace cc 1524 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698