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

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

Issue 634683003: 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 inverse_device_scale_factor_ = 1.0f / frame_data->device_scale_factor; 146 inverse_device_scale_factor_ = 1.0f / frame_data->device_scale_factor;
147 // Display size is already set so we can compute what the damage rect 147 // Display size is already set so we can compute what the damage rect
148 // will be in layer space. The damage may exceed the visible portion of 148 // will be in layer space. The damage may exceed the visible portion of
149 // the frame, so intersect the damage to the layer's bounds. 149 // the frame, so intersect the damage to the layer's bounds.
150 RenderPass* new_root_pass = render_pass_list.back(); 150 RenderPass* new_root_pass = render_pass_list.back();
151 gfx::Size frame_size = new_root_pass->output_rect.size(); 151 gfx::Size frame_size = new_root_pass->output_rect.size();
152 gfx::RectF damage_in_layer = damage_in_frame; 152 gfx::RectF damage_in_layer = damage_in_frame;
153 damage_in_layer.Scale(inverse_device_scale_factor_); 153 damage_in_layer.Scale(inverse_device_scale_factor_);
154 SetUpdateRect(gfx::IntersectRects( 154 SetUpdateRect(gfx::IntersectRects(
155 gfx::UnionRects(update_rect(), damage_in_layer), gfx::Rect(bounds()))); 155 gfx::UnionRects(update_rect(), damage_in_layer), gfx::RectF(bounds())));
156 156
157 SetRenderPasses(&render_pass_list); 157 SetRenderPasses(&render_pass_list);
158 have_render_passes_to_push_ = true; 158 have_render_passes_to_push_ = true;
159 } 159 }
160 160
161 void DelegatedRendererLayerImpl::SetRenderPasses( 161 void DelegatedRendererLayerImpl::SetRenderPasses(
162 RenderPassList* render_passes_in_draw_order) { 162 RenderPassList* render_passes_in_draw_order) {
163 ClearRenderPasses(); 163 ClearRenderPasses();
164 164
165 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) { 165 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 if (own_child_id_) { 495 if (own_child_id_) {
496 ResourceProvider* provider = layer_tree_impl()->resource_provider(); 496 ResourceProvider* provider = layer_tree_impl()->resource_provider();
497 provider->DestroyChild(child_id_); 497 provider->DestroyChild(child_id_);
498 } 498 }
499 499
500 resources_.clear(); 500 resources_.clear();
501 child_id_ = 0; 501 child_id_ = 0;
502 } 502 }
503 503
504 } // namespace cc 504 } // 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