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

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

Issue 1158433010: Reland: 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: mojo update 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
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)) {
17 } 16 }
18 17
19 RenderPassDrawQuad::~RenderPassDrawQuad() { 18 RenderPassDrawQuad::~RenderPassDrawQuad() {
20 } 19 }
21 20
22 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state, 21 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
23 const gfx::Rect& rect, 22 const gfx::Rect& rect,
24 const gfx::Rect& visible_rect, 23 const gfx::Rect& visible_rect,
25 RenderPassId render_pass_id, 24 RenderPassId render_pass_id,
26 ResourceId mask_resource_id, 25 ResourceId mask_resource_id,
27 const gfx::Vector2dF& mask_uv_scale, 26 const gfx::Vector2dF& mask_uv_scale,
28 const gfx::Size& mask_texture_size, 27 const gfx::Size& mask_texture_size,
29 const FilterOperations& filters, 28 const FilterOperations& filters,
30 const gfx::Vector2dF& filters_scale, 29 const gfx::Vector2dF& filters_scale,
31 const FilterOperations& background_filters) { 30 const FilterOperations& background_filters) {
32 DCHECK_GT(render_pass_id.layer_id, 0); 31 DCHECK_GT(render_pass_id.layer_id, 0);
33 DCHECK_GE(render_pass_id.index, 0);
34 32
35 gfx::Rect opaque_rect; 33 gfx::Rect opaque_rect;
36 bool needs_blending = false; 34 bool needs_blending = false;
37 SetAll(shared_quad_state, 35 SetAll(shared_quad_state,
38 rect, 36 rect,
39 opaque_rect, 37 opaque_rect,
40 visible_rect, 38 visible_rect,
41 needs_blending, 39 needs_blending,
42 render_pass_id, 40 render_pass_id,
43 mask_resource_id, 41 mask_resource_id,
(...skipping 10 matching lines...) Expand all
54 const gfx::Rect& visible_rect, 52 const gfx::Rect& visible_rect,
55 bool needs_blending, 53 bool needs_blending,
56 RenderPassId render_pass_id, 54 RenderPassId render_pass_id,
57 ResourceId mask_resource_id, 55 ResourceId mask_resource_id,
58 const gfx::Vector2dF& mask_uv_scale, 56 const gfx::Vector2dF& mask_uv_scale,
59 const gfx::Size& mask_texture_size, 57 const gfx::Size& mask_texture_size,
60 const FilterOperations& filters, 58 const FilterOperations& filters,
61 const gfx::Vector2dF& filters_scale, 59 const gfx::Vector2dF& filters_scale,
62 const FilterOperations& background_filters) { 60 const FilterOperations& background_filters) {
63 DCHECK_GT(render_pass_id.layer_id, 0); 61 DCHECK_GT(render_pass_id.layer_id, 0);
64 DCHECK_GE(render_pass_id.index, 0);
65 62
66 DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect, 63 DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect,
67 visible_rect, needs_blending); 64 visible_rect, needs_blending);
68 this->render_pass_id = render_pass_id; 65 this->render_pass_id = render_pass_id;
69 resources.ids[kMaskResourceIdIndex] = mask_resource_id; 66 resources.ids[kMaskResourceIdIndex] = mask_resource_id;
70 resources.count = mask_resource_id ? 1 : 0; 67 resources.count = mask_resource_id ? 1 : 0;
71 this->mask_uv_scale = mask_uv_scale; 68 this->mask_uv_scale = mask_uv_scale;
72 this->mask_texture_size = mask_texture_size; 69 this->mask_texture_size = mask_texture_size;
73 this->filters = filters; 70 this->filters = filters;
74 this->filters_scale = filters_scale; 71 this->filters_scale = filters_scale;
(...skipping 25 matching lines...) Expand all
100 filters.AsValueInto(value); 97 filters.AsValueInto(value);
101 value->EndDictionary(); 98 value->EndDictionary();
102 MathUtil::AddToTracedValue("filters_scale", filters_scale, value); 99 MathUtil::AddToTracedValue("filters_scale", filters_scale, value);
103 100
104 value->BeginDictionary("background_filters"); 101 value->BeginDictionary("background_filters");
105 background_filters.AsValueInto(value); 102 background_filters.AsValueInto(value);
106 value->EndDictionary(); 103 value->EndDictionary();
107 } 104 }
108 105
109 } // namespace cc 106 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698