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

Side by Side Diff: cc/layers/delegated_renderer_layer_impl.cc

Issue 385433002: Push inverse device scale factor in DRLI->DRLI pushes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dcheck->expect Created 6 years, 5 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/layers/delegated_renderer_layer_impl.h" 5 #include "cc/layers/delegated_renderer_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void DelegatedRendererLayerImpl::PushPropertiesTo(LayerImpl* layer) { 65 void DelegatedRendererLayerImpl::PushPropertiesTo(LayerImpl* layer) {
66 LayerImpl::PushPropertiesTo(layer); 66 LayerImpl::PushPropertiesTo(layer);
67 67
68 DelegatedRendererLayerImpl* delegated_layer = 68 DelegatedRendererLayerImpl* delegated_layer =
69 static_cast<DelegatedRendererLayerImpl*>(layer); 69 static_cast<DelegatedRendererLayerImpl*>(layer);
70 70
71 // If we have a new child_id to give to the active layer, it should 71 // If we have a new child_id to give to the active layer, it should
72 // have already deleted its old child_id. 72 // have already deleted its old child_id.
73 DCHECK(delegated_layer->child_id_ == 0 || 73 DCHECK(delegated_layer->child_id_ == 0 ||
74 delegated_layer->child_id_ == child_id_); 74 delegated_layer->child_id_ == child_id_);
75 delegated_layer->inverse_device_scale_factor_ = inverse_device_scale_factor_;
75 delegated_layer->child_id_ = child_id_; 76 delegated_layer->child_id_ = child_id_;
76 delegated_layer->own_child_id_ = true; 77 delegated_layer->own_child_id_ = true;
77 own_child_id_ = false; 78 own_child_id_ = false;
78 79
79 if (have_render_passes_to_push_) { 80 if (have_render_passes_to_push_) {
80 // This passes ownership of the render passes to the active tree. 81 // This passes ownership of the render passes to the active tree.
81 delegated_layer->SetRenderPasses(&render_passes_in_draw_order_); 82 delegated_layer->SetRenderPasses(&render_passes_in_draw_order_);
82 DCHECK(render_passes_in_draw_order_.empty()); 83 DCHECK(render_passes_in_draw_order_.empty());
83 have_render_passes_to_push_ = false; 84 have_render_passes_to_push_ = false;
84 } 85 }
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 if (own_child_id_) { 484 if (own_child_id_) {
484 ResourceProvider* provider = layer_tree_impl()->resource_provider(); 485 ResourceProvider* provider = layer_tree_impl()->resource_provider();
485 provider->DestroyChild(child_id_); 486 provider->DestroyChild(child_id_);
486 } 487 }
487 488
488 resources_.clear(); 489 resources_.clear();
489 child_id_ = 0; 490 child_id_ = 0;
490 } 491 }
491 492
492 } // namespace cc 493 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698