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

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

Issue 637913003: Revert of "Converted LayerImpl::bounds() to return SizeF." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « cc/debug/debug_rect_history.cc ('k') | cc/layers/heads_up_display_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 inverse_device_scale_factor_ = 1.0f / frame_data->device_scale_factor; 143 inverse_device_scale_factor_ = 1.0f / frame_data->device_scale_factor;
144 // Display size is already set so we can compute what the damage rect 144 // Display size is already set so we can compute what the damage rect
145 // will be in layer space. The damage may exceed the visible portion of 145 // will be in layer space. The damage may exceed the visible portion of
146 // the frame, so intersect the damage to the layer's bounds. 146 // the frame, so intersect the damage to the layer's bounds.
147 RenderPass* new_root_pass = render_pass_list.back(); 147 RenderPass* new_root_pass = render_pass_list.back();
148 gfx::Size frame_size = new_root_pass->output_rect.size(); 148 gfx::Size frame_size = new_root_pass->output_rect.size();
149 gfx::RectF damage_in_layer = damage_in_frame; 149 gfx::RectF damage_in_layer = damage_in_frame;
150 damage_in_layer.Scale(inverse_device_scale_factor_); 150 damage_in_layer.Scale(inverse_device_scale_factor_);
151 SetUpdateRect(gfx::IntersectRects( 151 SetUpdateRect(gfx::IntersectRects(
152 gfx::UnionRects(update_rect(), damage_in_layer), gfx::RectF(bounds()))); 152 gfx::UnionRects(update_rect(), damage_in_layer), gfx::Rect(bounds())));
153 153
154 SetRenderPasses(&render_pass_list); 154 SetRenderPasses(&render_pass_list);
155 have_render_passes_to_push_ = true; 155 have_render_passes_to_push_ = true;
156 } 156 }
157 157
158 void DelegatedRendererLayerImpl::SetRenderPasses( 158 void DelegatedRendererLayerImpl::SetRenderPasses(
159 RenderPassList* render_passes_in_draw_order) { 159 RenderPassList* render_passes_in_draw_order) {
160 ClearRenderPasses(); 160 ClearRenderPasses();
161 161
162 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) { 162 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) {
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 if (own_child_id_) { 491 if (own_child_id_) {
492 ResourceProvider* provider = layer_tree_impl()->resource_provider(); 492 ResourceProvider* provider = layer_tree_impl()->resource_provider();
493 provider->DestroyChild(child_id_); 493 provider->DestroyChild(child_id_);
494 } 494 }
495 495
496 resources_.clear(); 496 resources_.clear();
497 child_id_ = 0; 497 child_id_ = 0;
498 } 498 }
499 499
500 } // namespace cc 500 } // namespace cc
OLDNEW
« no previous file with comments | « cc/debug/debug_rect_history.cc ('k') | cc/layers/heads_up_display_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698