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

Side by Side Diff: cc/layers/painted_scrollbar_layer_impl.cc

Issue 1062043003: cc: Add ResourceId validation checks at the time of AppendQuads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resource-validate: fixtests 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 unified diff | Download patch
« no previous file with comments | « cc/layers/nine_patch_layer_impl_unittest.cc ('k') | cc/layers/picture_layer_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/layers/painted_scrollbar_layer_impl.h" 5 #include "cc/layers/painted_scrollbar_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/animation/scrollbar_animation_controller.h" 9 #include "cc/animation/scrollbar_animation_controller.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 visible_thumb_quad_rect, internal_contents_scale_); 96 visible_thumb_quad_rect, internal_contents_scale_);
97 97
98 ResourceProvider::ResourceId thumb_resource_id = 98 ResourceProvider::ResourceId thumb_resource_id =
99 layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_); 99 layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_);
100 ResourceProvider::ResourceId track_resource_id = 100 ResourceProvider::ResourceId track_resource_id =
101 layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_); 101 layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_);
102 102
103 if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) { 103 if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) {
104 gfx::Rect opaque_rect; 104 gfx::Rect opaque_rect;
105 const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; 105 const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
106 // TODO(danakj): crbug.com/455931
107 layer_tree_impl()->resource_provider()->ValidateResource(thumb_resource_id);
106 TextureDrawQuad* quad = 108 TextureDrawQuad* quad =
107 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); 109 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
108 quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect, 110 quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect,
109 scaled_visible_thumb_quad_rect, thumb_resource_id, 111 scaled_visible_thumb_quad_rect, thumb_resource_id,
110 premultipled_alpha, uv_top_left, uv_bottom_right, 112 premultipled_alpha, uv_top_left, uv_bottom_right,
111 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor); 113 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
112 } 114 }
113 115
114 gfx::Rect track_quad_rect(bounds()); 116 gfx::Rect track_quad_rect(bounds());
115 gfx::Rect scaled_track_quad_rect(internal_content_bounds_); 117 gfx::Rect scaled_track_quad_rect(internal_content_bounds_);
116 gfx::Rect visible_track_quad_rect = 118 gfx::Rect visible_track_quad_rect =
117 draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( 119 draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
118 track_quad_rect); 120 track_quad_rect);
119 gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect( 121 gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect(
120 visible_track_quad_rect, internal_contents_scale_); 122 visible_track_quad_rect, internal_contents_scale_);
121 if (track_resource_id && !visible_track_quad_rect.IsEmpty()) { 123 if (track_resource_id && !visible_track_quad_rect.IsEmpty()) {
122 gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect 124 gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect
123 : gfx::Rect()); 125 : gfx::Rect());
124 const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; 126 const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
127 // TODO(danakj): crbug.com/455931
128 layer_tree_impl()->resource_provider()->ValidateResource(track_resource_id);
125 TextureDrawQuad* quad = 129 TextureDrawQuad* quad =
126 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); 130 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
127 quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect, 131 quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect,
128 scaled_visible_track_quad_rect, track_resource_id, 132 scaled_visible_track_quad_rect, track_resource_id,
129 premultipled_alpha, uv_top_left, uv_bottom_right, 133 premultipled_alpha, uv_top_left, uv_bottom_right,
130 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor); 134 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
131 } 135 }
132 } 136 }
133 137
134 gfx::Rect PaintedScrollbarLayerImpl::GetEnclosingRectInTargetSpace() const { 138 gfx::Rect PaintedScrollbarLayerImpl::GetEnclosingRectInTargetSpace() const {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 185
182 bool PaintedScrollbarLayerImpl::IsThumbResizable() const { 186 bool PaintedScrollbarLayerImpl::IsThumbResizable() const {
183 return false; 187 return false;
184 } 188 }
185 189
186 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const { 190 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const {
187 return "cc::PaintedScrollbarLayerImpl"; 191 return "cc::PaintedScrollbarLayerImpl";
188 } 192 }
189 193
190 } // namespace cc 194 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/nine_patch_layer_impl_unittest.cc ('k') | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698