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

Side by Side Diff: cc/quads/render_pass_draw_quad.cc

Issue 1647573002: cc cleanup: simplify mask_uv_scale and MaskUVRect(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/output/renderer_pixeltest.cc ('k') | cc/trees/layer_tree_host_unittest.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 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/quads/render_pass_draw_quad.h" 5 #include "cc/quads/render_pass_draw_quad.h"
6 6
7 #include "base/trace_event/trace_event_argument.h" 7 #include "base/trace_event/trace_event_argument.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "cc/base/math_util.h" 9 #include "cc/base/math_util.h"
10 #include "cc/debug/traced_value.h" 10 #include "cc/debug/traced_value.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 resources.ids[kMaskResourceIdIndex] = mask_resource_id; 66 resources.ids[kMaskResourceIdIndex] = mask_resource_id;
67 resources.count = mask_resource_id ? 1 : 0; 67 resources.count = mask_resource_id ? 1 : 0;
68 this->mask_uv_scale = mask_uv_scale; 68 this->mask_uv_scale = mask_uv_scale;
69 this->mask_texture_size = mask_texture_size; 69 this->mask_texture_size = mask_texture_size;
70 this->filters = filters; 70 this->filters = filters;
71 this->filters_scale = filters_scale; 71 this->filters_scale = filters_scale;
72 this->background_filters = background_filters; 72 this->background_filters = background_filters;
73 } 73 }
74 74
75 gfx::RectF RenderPassDrawQuad::MaskUVRect() const { 75 gfx::RectF RenderPassDrawQuad::MaskUVRect() const {
76 gfx::RectF mask_uv_rect((mask_uv_scale.x() * rect.x()) / rect.width(), 76 return gfx::ScaleRect(gfx::RectF(rect), mask_uv_scale.x(), mask_uv_scale.y());
77 (mask_uv_scale.y() * rect.y()) / rect.height(),
78 mask_uv_scale.x(),
79 mask_uv_scale.y());
80 return mask_uv_rect;
81 } 77 }
82 78
83 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast( 79 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(
84 const DrawQuad* quad) { 80 const DrawQuad* quad) {
85 DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS); 81 DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS);
86 return static_cast<const RenderPassDrawQuad*>(quad); 82 return static_cast<const RenderPassDrawQuad*>(quad);
87 } 83 }
88 84
89 void RenderPassDrawQuad::ExtendValue( 85 void RenderPassDrawQuad::ExtendValue(
90 base::trace_event::TracedValue* value) const { 86 base::trace_event::TracedValue* value) const {
91 TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id"); 87 TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id");
92 value->SetInteger("mask_resource_id", resources.ids[kMaskResourceIdIndex]); 88 value->SetInteger("mask_resource_id", resources.ids[kMaskResourceIdIndex]);
93 MathUtil::AddToTracedValue("mask_texture_size", mask_texture_size, value); 89 MathUtil::AddToTracedValue("mask_texture_size", mask_texture_size, value);
94 MathUtil::AddToTracedValue("mask_uv_scale", mask_uv_scale, value); 90 MathUtil::AddToTracedValue("mask_uv_scale", mask_uv_scale, value);
95 91
96 value->BeginArray("filters"); 92 value->BeginArray("filters");
97 filters.AsValueInto(value); 93 filters.AsValueInto(value);
98 value->EndArray(); 94 value->EndArray();
99 MathUtil::AddToTracedValue("filters_scale", filters_scale, value); 95 MathUtil::AddToTracedValue("filters_scale", filters_scale, value);
100 96
101 value->BeginDictionary("background_filters"); 97 value->BeginDictionary("background_filters");
102 background_filters.AsValueInto(value); 98 background_filters.AsValueInto(value);
103 value->EndDictionary(); 99 value->EndDictionary();
104 } 100 }
105 101
106 } // namespace cc 102 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698