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

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

Issue 659683002: Include mask texture size in RenderPassDrawQuad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@update_mask_draw_quad_test
Patch Set: No ToEnclosedRect 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/quads/render_pass_draw_quad.h ('k') | cc/quads/render_pass_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/debug/trace_event_argument.h" 7 #include "base/debug/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"
11 #include "third_party/skia/include/core/SkImageFilter.h" 11 #include "third_party/skia/include/core/SkImageFilter.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 RenderPassDrawQuad::RenderPassDrawQuad() 15 RenderPassDrawQuad::RenderPassDrawQuad()
16 : render_pass_id(RenderPassId(-1, -1)), 16 : render_pass_id(RenderPassId(-1, -1)),
17 mask_resource_id(static_cast<ResourceProvider::ResourceId>(-1)) { 17 mask_resource_id(static_cast<ResourceProvider::ResourceId>(-1)) {
18 } 18 }
19 19
20 RenderPassDrawQuad::~RenderPassDrawQuad() { 20 RenderPassDrawQuad::~RenderPassDrawQuad() {
21 } 21 }
22 22
23 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state, 23 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
24 const gfx::Rect& rect, 24 const gfx::Rect& rect,
25 const gfx::Rect& visible_rect, 25 const gfx::Rect& visible_rect,
26 RenderPassId render_pass_id, 26 RenderPassId render_pass_id,
27 ResourceProvider::ResourceId mask_resource_id, 27 ResourceProvider::ResourceId mask_resource_id,
28 const gfx::RectF& mask_uv_rect, 28 const gfx::Vector2dF& mask_uv_scale,
29 const gfx::Size& mask_texture_size,
29 const FilterOperations& filters, 30 const FilterOperations& filters,
30 const gfx::Vector2dF& filters_scale, 31 const gfx::Vector2dF& filters_scale,
31 const FilterOperations& background_filters) { 32 const FilterOperations& background_filters) {
32 DCHECK_GT(render_pass_id.layer_id, 0); 33 DCHECK_GT(render_pass_id.layer_id, 0);
33 DCHECK_GE(render_pass_id.index, 0); 34 DCHECK_GE(render_pass_id.index, 0);
34 35
35 gfx::Rect opaque_rect; 36 gfx::Rect opaque_rect;
36 bool needs_blending = false; 37 bool needs_blending = false;
37 SetAll(shared_quad_state, 38 SetAll(shared_quad_state,
38 rect, 39 rect,
39 opaque_rect, 40 opaque_rect,
40 visible_rect, 41 visible_rect,
41 needs_blending, 42 needs_blending,
42 render_pass_id, 43 render_pass_id,
43 mask_resource_id, 44 mask_resource_id,
44 mask_uv_rect, 45 mask_uv_scale,
46 mask_texture_size,
45 filters, 47 filters,
46 filters_scale, 48 filters_scale,
47 background_filters); 49 background_filters);
48 } 50 }
49 51
50 void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state, 52 void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
51 const gfx::Rect& rect, 53 const gfx::Rect& rect,
52 const gfx::Rect& opaque_rect, 54 const gfx::Rect& opaque_rect,
53 const gfx::Rect& visible_rect, 55 const gfx::Rect& visible_rect,
54 bool needs_blending, 56 bool needs_blending,
55 RenderPassId render_pass_id, 57 RenderPassId render_pass_id,
56 ResourceProvider::ResourceId mask_resource_id, 58 ResourceProvider::ResourceId mask_resource_id,
57 const gfx::RectF& mask_uv_rect, 59 const gfx::Vector2dF& mask_uv_scale,
60 const gfx::Size& mask_texture_size,
58 const FilterOperations& filters, 61 const FilterOperations& filters,
59 const gfx::Vector2dF& filters_scale, 62 const gfx::Vector2dF& filters_scale,
60 const FilterOperations& background_filters) { 63 const FilterOperations& background_filters) {
61 DCHECK_GT(render_pass_id.layer_id, 0); 64 DCHECK_GT(render_pass_id.layer_id, 0);
62 DCHECK_GE(render_pass_id.index, 0); 65 DCHECK_GE(render_pass_id.index, 0);
63 66
64 DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect, 67 DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect,
65 visible_rect, needs_blending); 68 visible_rect, needs_blending);
66 this->render_pass_id = render_pass_id; 69 this->render_pass_id = render_pass_id;
67 this->mask_resource_id = mask_resource_id; 70 this->mask_resource_id = mask_resource_id;
68 this->mask_uv_rect = mask_uv_rect; 71 this->mask_uv_scale = mask_uv_scale;
72 this->mask_texture_size = mask_texture_size;
69 this->filters = filters; 73 this->filters = filters;
70 this->filters_scale = filters_scale; 74 this->filters_scale = filters_scale;
71 this->background_filters = background_filters; 75 this->background_filters = background_filters;
72 } 76 }
73 77
74 void RenderPassDrawQuad::IterateResources( 78 void RenderPassDrawQuad::IterateResources(
75 const ResourceIteratorCallback& callback) { 79 const ResourceIteratorCallback& callback) {
76 if (mask_resource_id) 80 if (mask_resource_id)
77 mask_resource_id = callback.Run(mask_resource_id); 81 mask_resource_id = callback.Run(mask_resource_id);
78 } 82 }
79 83
84 gfx::RectF RenderPassDrawQuad::MaskUVRect() const {
85 gfx::RectF mask_uv_rect((mask_uv_scale.x() * rect.x()) / rect.width(),
86 (mask_uv_scale.y() * rect.y()) / rect.height(),
87 mask_uv_scale.x(),
88 mask_uv_scale.y());
89 return mask_uv_rect;
90 }
91
80 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast( 92 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(
81 const DrawQuad* quad) { 93 const DrawQuad* quad) {
82 DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS); 94 DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS);
83 return static_cast<const RenderPassDrawQuad*>(quad); 95 return static_cast<const RenderPassDrawQuad*>(quad);
84 } 96 }
85 97
86 void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const { 98 void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const {
87 TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id"); 99 TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id");
88 value->SetInteger("mask_resource_id", mask_resource_id); 100 value->SetInteger("mask_resource_id", mask_resource_id);
89 101
90 value->BeginArray("mask_uv_rect"); 102 value->BeginArray("mask_texture_size");
91 MathUtil::AddToTracedValue(mask_uv_rect, value); 103 MathUtil::AddToTracedValue(mask_texture_size, value);
104 value->EndArray();
105
106 value->BeginArray("mask_uv_scale");
107 MathUtil::AddToTracedValue(mask_uv_scale, value);
92 value->EndArray(); 108 value->EndArray();
93 109
94 value->BeginDictionary("filters"); 110 value->BeginDictionary("filters");
95 filters.AsValueInto(value); 111 filters.AsValueInto(value);
96 value->EndDictionary(); 112 value->EndDictionary();
97 113
98 value->BeginArray("filters_scale"); 114 value->BeginArray("filters_scale");
99 MathUtil::AddToTracedValue(filters_scale, value); 115 MathUtil::AddToTracedValue(filters_scale, value);
100 value->EndArray(); 116 value->EndArray();
101 117
102 value->BeginDictionary("background_filters"); 118 value->BeginDictionary("background_filters");
103 background_filters.AsValueInto(value); 119 background_filters.AsValueInto(value);
104 value->EndDictionary(); 120 value->EndDictionary();
105 } 121 }
106 122
107 } // namespace cc 123 } // namespace cc
OLDNEW
« no previous file with comments | « cc/quads/render_pass_draw_quad.h ('k') | cc/quads/render_pass_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698