Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/layers/render_surface_impl.h" | 5 #include "cc/layers/render_surface_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 uv_scale_x, | 208 uv_scale_x, |
| 209 uv_scale_y); | 209 uv_scale_y); |
| 210 } | 210 } |
| 211 | 211 |
| 212 ResourceProvider::ResourceId mask_resource_id = | 212 ResourceProvider::ResourceId mask_resource_id = |
| 213 mask_layer ? mask_layer->ContentsResourceId() : 0; | 213 mask_layer ? mask_layer->ContentsResourceId() : 0; |
| 214 gfx::Rect contents_changed_since_last_frame = | 214 gfx::Rect contents_changed_since_last_frame = |
| 215 ContentsChanged() ? content_rect_ : gfx::Rect(); | 215 ContentsChanged() ? content_rect_ : gfx::Rect(); |
| 216 | 216 |
| 217 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); | 217 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); |
| 218 gfx::Transform scale = | |
| 219 owning_layer_->draw_properties().target_space_transform; | |
|
danakj
2014/03/07 17:35:44
Invert the order here.
Transform Scale() should h
Stephen White
2014/03/07 20:45:58
Done (probably shouldn't make a difference if it r
| |
| 220 scale.Scale(owning_layer_->contents_scale_x(), | |
| 221 owning_layer_->contents_scale_y()); | |
| 218 quad->SetNew(shared_quad_state, | 222 quad->SetNew(shared_quad_state, |
| 219 content_rect_, | 223 content_rect_, |
| 220 render_pass_id, | 224 render_pass_id, |
| 221 for_replica, | 225 for_replica, |
| 222 mask_resource_id, | 226 mask_resource_id, |
| 223 contents_changed_since_last_frame, | 227 contents_changed_since_last_frame, |
| 224 mask_uv_rect, | 228 mask_uv_rect, |
| 225 owning_layer_->filters(), | 229 owning_layer_->filters(), |
| 226 owning_layer_->background_filters()); | 230 owning_layer_->background_filters(), |
| 231 scale); | |
| 227 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 232 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 228 } | 233 } |
| 229 | 234 |
| 230 } // namespace cc | 235 } // namespace cc |
| OLD | NEW |