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

Side by Side Diff: cc/layers/ui_resource_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/tiled_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_impl_unittest.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/ui_resource_layer_impl.h" 5 #include "cc/layers/ui_resource_layer_impl.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.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/quads/texture_draw_quad.h" 10 #include "cc/quads/texture_draw_quad.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 if (!ui_resource_id_) 104 if (!ui_resource_id_)
105 return; 105 return;
106 106
107 ResourceProvider::ResourceId resource = 107 ResourceProvider::ResourceId resource =
108 layer_tree_impl()->ResourceIdForUIResource(ui_resource_id_); 108 layer_tree_impl()->ResourceIdForUIResource(ui_resource_id_);
109 109
110 if (!resource) 110 if (!resource)
111 return; 111 return;
112 112
113 // TODO(danakj): crbug.com/455931
114 layer_tree_impl()->resource_provider()->ValidateResource(resource);
115
113 static const bool flipped = false; 116 static const bool flipped = false;
114 static const bool nearest_neighbor = false; 117 static const bool nearest_neighbor = false;
115 static const bool premultiplied_alpha = true; 118 static const bool premultiplied_alpha = true;
116 119
117 DCHECK(!bounds().IsEmpty()); 120 DCHECK(!bounds().IsEmpty());
118 121
119 bool opaque = layer_tree_impl()->IsUIResourceOpaque(ui_resource_id_) || 122 bool opaque = layer_tree_impl()->IsUIResourceOpaque(ui_resource_id_) ||
120 contents_opaque(); 123 contents_opaque();
121 124
122 gfx::Rect quad_rect(bounds()); 125 gfx::Rect quad_rect(bounds());
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 list->AppendDouble(vertex_opacity_[3]); 162 list->AppendDouble(vertex_opacity_[3]);
160 result->Set("VertexOpacity", list); 163 result->Set("VertexOpacity", list);
161 164
162 result->Set("UVTopLeft", MathUtil::AsValue(uv_top_left_).release()); 165 result->Set("UVTopLeft", MathUtil::AsValue(uv_top_left_).release());
163 result->Set("UVBottomRight", MathUtil::AsValue(uv_bottom_right_).release()); 166 result->Set("UVBottomRight", MathUtil::AsValue(uv_bottom_right_).release());
164 167
165 return result; 168 return result;
166 } 169 }
167 170
168 } // namespace cc 171 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/tiled_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698