cc: Use ResourceProvider::Resouce::type to check the type of the given resource.

cc/resources/resource_provider.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
 #include <string>
@@ skipping 347 matching lines @@
 
   // Indicates if we can currently lock this resource for write.
   bool CanLockForWrite(ResourceId id);
 
   static GLint GetActiveTextureUnit(gpu::gles2::GLES2Interface* gl);
 
  private:
   struct Resource {
     Resource();
     ~Resource();
+    enum Origin {

[danakj, 2014/01/28 21:59:02]

This seems like an odd place, in the middle of the constructors/destructors.
Move to the top of the struct with a whitespace line after it?

+      Internal,
+      External,
+      Delegated,
+    };
     Resource(unsigned texture_id,
              gfx::Size size,
+             Origin origin,
              GLenum target,
              GLenum filter,
              GLenum texture_pool,
              GLint wrap_mode,
              TextureUsageHint hint,
              ResourceFormat format);
     Resource(uint8_t* pixels,
              SharedBitmap* bitmap,
              gfx::Size size,
+             Origin origin,
              GLenum filter,
              GLint wrap_mode);
 
     int child_id;
     unsigned gl_id;
     // Pixel buffer used for set pixels without unnecessary copying.
     unsigned gl_pixel_buffer_id;
     // Query used to determine when asynchronous set pixels complete.
     unsigned gl_upload_query_id;
     TextureMailbox mailbox;
     ReleaseCallback release_callback;
     uint8_t* pixels;
     uint8_t* pixel_buffer;
     int lock_for_read_count;
     int imported_count;
     int exported_count;
     bool locked_for_write;
-    enum Origin {
-      Internal,
-      External,
-      Delegated,
-    };
     Origin origin;
     bool marked_for_deletion;
     bool pending_set_pixels;
     bool set_pixels_completion_forced;
     bool allocated;
     bool enable_read_lock_fences;
     scoped_refptr<Fence> read_lock_fence;
     gfx::Size size;
     GLenum target;
     // TODO(skyostil): Use a separate sampler object for filter state.
@@ skipping 146 matching lines @@
   return format_gl_data_format[format];
 }
 
 inline GLenum GLInternalFormat(ResourceFormat format) {
   return GLDataFormat(format);
 }
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_