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

Unified Diff: cc/quads/render_pass_draw_quad.cc

Issue 1152473006: cc: Remove DrawQuad::IterateResoruces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: cc/quads/render_pass_draw_quad.cc
diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc
index ee9c74843cbde28add14bb5bb84e887a27205e28..4b48d134be9cfae12f12617b7f474cc1635faf7b 100644
--- a/cc/quads/render_pass_draw_quad.cc
+++ b/cc/quads/render_pass_draw_quad.cc
@@ -13,8 +13,7 @@
namespace cc {
RenderPassDrawQuad::RenderPassDrawQuad()
- : render_pass_id(RenderPassId(-1, -1)),
- mask_resource_id(static_cast<ResourceId>(-1)) {
+ : render_pass_id(RenderPassId(-1, -1)) {
}
RenderPassDrawQuad::~RenderPassDrawQuad() {
@@ -67,7 +66,8 @@ void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect,
visible_rect, needs_blending);
this->render_pass_id = render_pass_id;
- this->mask_resource_id = mask_resource_id;
+ resources.ids[kMaskResourceIdIndex] = mask_resource_id;
+ resources.count = resources.ids[kMaskResourceIdIndex] ? 1 : 0;
danakj 2015/05/28 23:00:15 nit: or use mask_resource_id again
vmpstr 2015/05/28 23:35:52 Done.
this->mask_uv_scale = mask_uv_scale;
this->mask_texture_size = mask_texture_size;
this->filters = filters;
@@ -75,12 +75,6 @@ void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
this->background_filters = background_filters;
}
-void RenderPassDrawQuad::IterateResources(
- const ResourceIteratorCallback& callback) {
- if (mask_resource_id)
- mask_resource_id = callback.Run(mask_resource_id);
-}
-
gfx::RectF RenderPassDrawQuad::MaskUVRect() const {
gfx::RectF mask_uv_rect((mask_uv_scale.x() * rect.x()) / rect.width(),
(mask_uv_scale.y() * rect.y()) / rect.height(),
@@ -98,7 +92,7 @@ const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(
void RenderPassDrawQuad::ExtendValue(
base::trace_event::TracedValue* value) const {
TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id");
- value->SetInteger("mask_resource_id", mask_resource_id);
+ value->SetInteger("mask_resource_id", resources.ids[kMaskResourceIdIndex]);
MathUtil::AddToTracedValue("mask_texture_size", mask_texture_size, value);
MathUtil::AddToTracedValue("mask_uv_scale", mask_uv_scale, value);

Powered by Google App Engine
This is Rietveld 408576698