cc: Add resource size sanity check to ResourceProvider.

R=piman BUG=236608 Review URL: https://chromiumcodereview.appspot.com/14701008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198136 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · May 3, 2013 · cdccc7d · cdccc7d
1 parent 90a986c
commit cdccc7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
@@ -172,6 +172,7 @@ bool ResourceProvider::InUseByConsumer(ResourceId id) {
 
 ResourceProvider::ResourceId ResourceProvider::CreateResource(
     gfx::Size size, GLenum format, TextureUsageHint hint) {
+  DCHECK(!size.IsEmpty());
   switch (default_resource_type_) {
     case GLTexture:
       return CreateGLTexture(
@@ -187,6 +188,7 @@ ResourceProvider::ResourceId ResourceProvider::CreateResource(
 
 ResourceProvider::ResourceId ResourceProvider::CreateManagedResource(
     gfx::Size size, GLenum format, TextureUsageHint hint) {
+  DCHECK(!size.IsEmpty());
   switch (default_resource_type_) {
     case GLTexture:
       return CreateGLTexture(

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -1237,7 +1237,7 @@ class MissingTextureAnimatingLayer : public DidDrawCheckLayer {
     set_skips_draw(skips_draw);
     if (!tile_missing) {
       ResourceProvider::ResourceId resource =
-          resource_provider->CreateResource(gfx::Size(),
+          resource_provider->CreateResource(gfx::Size(1, 1),
                                             GL_RGBA,
                                             ResourceProvider::TextureUsageAny);
       resource_provider->AllocateForTesting(resource);