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

Unified Diff: cc/layers/painted_scrollbar_layer_impl.cc

Issue 1096703006: cc: Some more cleanup and removing TODOs for validating resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup2: const Created 5 years, 8 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
« no previous file with comments | « cc/layers/nine_patch_layer_impl.cc ('k') | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/painted_scrollbar_layer_impl.cc
diff --git a/cc/layers/painted_scrollbar_layer_impl.cc b/cc/layers/painted_scrollbar_layer_impl.cc
index ad98c4f15719133d8cadbb0d5c94967eef121a14..005e0876948cbe1269d278c44ac2b1b0d45b8436 100644
--- a/cc/layers/painted_scrollbar_layer_impl.cc
+++ b/cc/layers/painted_scrollbar_layer_impl.cc
@@ -103,14 +103,13 @@ void PaintedScrollbarLayerImpl::AppendQuads(
if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) {
gfx::Rect opaque_rect;
const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
- // TODO(danakj): crbug.com/455931
- layer_tree_impl()->resource_provider()->ValidateResource(thumb_resource_id);
TextureDrawQuad* quad =
render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect,
scaled_visible_thumb_quad_rect, thumb_resource_id,
premultipled_alpha, uv_top_left, uv_bottom_right,
SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
+ ValidateQuadResources(quad);
}
gfx::Rect track_quad_rect(bounds());
@@ -124,14 +123,13 @@ void PaintedScrollbarLayerImpl::AppendQuads(
gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect
: gfx::Rect());
const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
- // TODO(danakj): crbug.com/455931
- layer_tree_impl()->resource_provider()->ValidateResource(track_resource_id);
TextureDrawQuad* quad =
render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect,
scaled_visible_track_quad_rect, track_resource_id,
premultipled_alpha, uv_top_left, uv_bottom_right,
SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
+ ValidateQuadResources(quad);
}
}
« no previous file with comments | « cc/layers/nine_patch_layer_impl.cc ('k') | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698