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

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

Issue 1155553006: Revert of cc: Fix size_t to int truncations in layers/ output/ playback/ quads/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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.cc ('k') | cc/quads/render_pass_id.h » ('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"
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 } 17 }
17 18
18 RenderPassDrawQuad::~RenderPassDrawQuad() { 19 RenderPassDrawQuad::~RenderPassDrawQuad() {
19 } 20 }
20 21
21 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state, 22 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
22 const gfx::Rect& rect, 23 const gfx::Rect& rect,
23 const gfx::Rect& visible_rect, 24 const gfx::Rect& visible_rect,
24 RenderPassId render_pass_id, 25 RenderPassId render_pass_id,
25 ResourceId mask_resource_id, 26 ResourceId mask_resource_id,
26 const gfx::Vector2dF& mask_uv_scale, 27 const gfx::Vector2dF& mask_uv_scale,
27 const gfx::Size& mask_texture_size, 28 const gfx::Size& mask_texture_size,
28 const FilterOperations& filters, 29 const FilterOperations& filters,
29 const gfx::Vector2dF& filters_scale, 30 const gfx::Vector2dF& filters_scale,
30 const FilterOperations& background_filters) { 31 const FilterOperations& background_filters) {
31 DCHECK_GT(render_pass_id.layer_id, 0); 32 DCHECK_GT(render_pass_id.layer_id, 0);
33 DCHECK_GE(render_pass_id.index, 0);
32 34
33 gfx::Rect opaque_rect; 35 gfx::Rect opaque_rect;
34 bool needs_blending = false; 36 bool needs_blending = false;
35 SetAll(shared_quad_state, 37 SetAll(shared_quad_state,
36 rect, 38 rect,
37 opaque_rect, 39 opaque_rect,
38 visible_rect, 40 visible_rect,
39 needs_blending, 41 needs_blending,
40 render_pass_id, 42 render_pass_id,
41 mask_resource_id, 43 mask_resource_id,
(...skipping 10 matching lines...) Expand all
52 const gfx::Rect& visible_rect, 54 const gfx::Rect& visible_rect,
53 bool needs_blending, 55 bool needs_blending,
54 RenderPassId render_pass_id, 56 RenderPassId render_pass_id,
55 ResourceId mask_resource_id, 57 ResourceId mask_resource_id,
56 const gfx::Vector2dF& mask_uv_scale, 58 const gfx::Vector2dF& mask_uv_scale,
57 const gfx::Size& mask_texture_size, 59 const gfx::Size& mask_texture_size,
58 const FilterOperations& filters, 60 const FilterOperations& filters,
59 const gfx::Vector2dF& filters_scale, 61 const gfx::Vector2dF& filters_scale,
60 const FilterOperations& background_filters) { 62 const FilterOperations& background_filters) {
61 DCHECK_GT(render_pass_id.layer_id, 0); 63 DCHECK_GT(render_pass_id.layer_id, 0);
64 DCHECK_GE(render_pass_id.index, 0);
62 65
63 DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect, 66 DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect,
64 visible_rect, needs_blending); 67 visible_rect, needs_blending);
65 this->render_pass_id = render_pass_id; 68 this->render_pass_id = render_pass_id;
66 resources.ids[kMaskResourceIdIndex] = mask_resource_id; 69 resources.ids[kMaskResourceIdIndex] = mask_resource_id;
67 resources.count = mask_resource_id ? 1 : 0; 70 resources.count = mask_resource_id ? 1 : 0;
68 this->mask_uv_scale = mask_uv_scale; 71 this->mask_uv_scale = mask_uv_scale;
69 this->mask_texture_size = mask_texture_size; 72 this->mask_texture_size = mask_texture_size;
70 this->filters = filters; 73 this->filters = filters;
71 this->filters_scale = filters_scale; 74 this->filters_scale = filters_scale;
(...skipping 25 matching lines...) Expand all
97 filters.AsValueInto(value); 100 filters.AsValueInto(value);
98 value->EndDictionary(); 101 value->EndDictionary();
99 MathUtil::AddToTracedValue("filters_scale", filters_scale, value); 102 MathUtil::AddToTracedValue("filters_scale", filters_scale, value);
100 103
101 value->BeginDictionary("background_filters"); 104 value->BeginDictionary("background_filters");
102 background_filters.AsValueInto(value); 105 background_filters.AsValueInto(value);
103 value->EndDictionary(); 106 value->EndDictionary();
104 } 107 }
105 108
106 } // namespace cc 109 } // namespace cc
OLDNEW
« no previous file with comments | « cc/quads/render_pass.cc ('k') | cc/quads/render_pass_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698