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

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

Issue 2495373003: Match html canvas which is transferred to OffscreenCanvas to CSS style (Closed)
Patch Set: fix Created 4 years 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 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/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 render_surface_->ClearLayerLists(); 170 render_surface_->ClearLayerLists();
171 } 171 }
172 172
173 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const { 173 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const {
174 state->SetAll(draw_properties_.target_space_transform, bounds(), 174 state->SetAll(draw_properties_.target_space_transform, bounds(),
175 draw_properties_.visible_layer_rect, draw_properties_.clip_rect, 175 draw_properties_.visible_layer_rect, draw_properties_.clip_rect,
176 draw_properties_.is_clipped, draw_properties_.opacity, 176 draw_properties_.is_clipped, draw_properties_.opacity,
177 draw_blend_mode_, sorting_context_id_); 177 draw_blend_mode_, sorting_context_id_);
178 } 178 }
179 179
180 void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state, 180 void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state,
danakj 2016/11/28 22:26:22 I don't think we need 2 methods really. How about
xlai (Olivia) 2016/12/13 17:29:17 Done.
181 float scale) const { 181 float scale) const {
182 PopulateScaledSharedQuadState(state, scale, scale);
183 }
184
185 void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state,
186 float scale_x,
danakj 2016/11/28 22:26:22 can you rename these input vars to all be like "la
xlai (Olivia) 2016/12/13 17:29:17 Done.
187 float scale_y) const {
182 gfx::Transform scaled_draw_transform = 188 gfx::Transform scaled_draw_transform =
183 draw_properties_.target_space_transform; 189 draw_properties_.target_space_transform;
184 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); 190 scaled_draw_transform.Scale(SK_MScalar1 / scale_x, SK_MScalar1 / scale_y);
185 gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(bounds(), scale); 191 gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(bounds(), scale_x, scale_y);
186 gfx::Rect scaled_visible_layer_rect = 192 gfx::Rect scaled_visible_layer_rect =
187 gfx::ScaleToEnclosingRect(visible_layer_rect(), scale); 193 gfx::ScaleToEnclosingRect(visible_layer_rect(), scale_x, scale_y);
188 scaled_visible_layer_rect.Intersect(gfx::Rect(scaled_bounds)); 194 scaled_visible_layer_rect.Intersect(gfx::Rect(scaled_bounds));
189 195
190 state->SetAll(scaled_draw_transform, scaled_bounds, scaled_visible_layer_rect, 196 state->SetAll(scaled_draw_transform, scaled_bounds, scaled_visible_layer_rect,
191 draw_properties().clip_rect, draw_properties().is_clipped, 197 draw_properties().clip_rect, draw_properties().is_clipped,
192 draw_properties().opacity, draw_blend_mode_, 198 draw_properties().opacity, draw_blend_mode_,
193 sorting_context_id_); 199 sorting_context_id_);
194 } 200 }
195 201
196 bool LayerImpl::WillDraw(DrawMode draw_mode, 202 bool LayerImpl::WillDraw(DrawMode draw_mode,
197 ResourceProvider* resource_provider) { 203 ResourceProvider* resource_provider) {
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 .layer_transforms_should_scale_layer_contents) { 1105 .layer_transforms_should_scale_layer_contents) {
1100 return default_scale; 1106 return default_scale;
1101 } 1107 }
1102 1108
1103 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( 1109 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
1104 ScreenSpaceTransform(), default_scale); 1110 ScreenSpaceTransform(), default_scale);
1105 return std::max(transform_scales.x(), transform_scales.y()); 1111 return std::max(transform_scales.x(), transform_scales.y());
1106 } 1112 }
1107 1113
1108 } // namespace cc 1114 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/surface_layer.h » ('j') | cc/layers/surface_layer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698