Rename cc::ResourceProvider::ResourceId to cc::ResourceId and move it to its own file.

cc/output/renderer_pixeltest.cc

 // 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.
 
 #include "base/message_loop/message_loop.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/video_resource_updater.h"
@@ skipping 119 matching lines @@
           : SkPackARGB32NoCheck(SkColorGetA(texel_stripe_color),
                                 SkColorGetR(texel_stripe_color),
                                 SkColorGetG(texel_stripe_color),
                                 SkColorGetB(texel_stripe_color));
   std::vector<uint32_t> pixels(rect.size().GetArea(), pixel_color);
   for (int i = rect.height() / 4; i < (rect.height() * 3 / 4); ++i) {
     for (int k = rect.width() / 4; k < (rect.width() * 3 / 4); ++k) {
       pixels[i * rect.width() + k] = pixel_stripe_color;
     }
   }
-  ResourceProvider::ResourceId resource = resource_provider->CreateResource(
+  ResourceId resource = resource_provider->CreateResource(
       rect.size(), GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
       RGBA_8888);
   resource_provider->SetPixels(resource,
                                reinterpret_cast<uint8_t*>(&pixels.front()),
                                rect, rect, gfx::Vector2d());
 
   float vertex_opacity[4] = {1.0f, 1.0f, 1.0f, 1.0f};
   const gfx::PointF uv_top_left(0.0f, 0.0f);
   const gfx::PointF uv_bottom_right(1.0f, 1.0f);
   const bool flipped = false;
@@ skipping 14 matching lines @@
                                RenderPass* render_pass) {
   SkPMColor pixel_color = premultiplied_alpha ?
       SkPreMultiplyColor(texel_color) :
       SkPackARGB32NoCheck(SkColorGetA(texel_color),
                           SkColorGetR(texel_color),
                           SkColorGetG(texel_color),
                           SkColorGetB(texel_color));
   size_t num_pixels = static_cast<size_t>(rect.width()) * rect.height();
   std::vector<uint32_t> pixels(num_pixels, pixel_color);
 
-  ResourceProvider::ResourceId resource = resource_provider->CreateResource(
+  ResourceId resource = resource_provider->CreateResource(
       rect.size(), GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
       RGBA_8888);
   resource_provider->CopyToResource(
       resource, reinterpret_cast<uint8_t*>(&pixels.front()), rect.size());
 
   float vertex_opacity[4] = {1.0f, 1.0f, 1.0f, 1.0f};
 
   const gfx::PointF uv_top_left(0.0f, 0.0f);
   const gfx::PointF uv_bottom_right(1.0f, 1.0f);
   const bool flipped = false;
@@ skipping 31 matching lines @@
   VideoFrameExternalResources resources =
       video_resource_updater->CreateExternalResourcesFromVideoFrame(
           video_frame);
 
   EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
   EXPECT_EQ(media::VideoFrame::NumPlanes(video_frame->format()),
             resources.mailboxes.size());
   EXPECT_EQ(media::VideoFrame::NumPlanes(video_frame->format()),
             resources.release_callbacks.size());
 
-  ResourceProvider::ResourceId y_resource =
-      resource_provider->CreateResourceFromTextureMailbox(
-          resources.mailboxes[media::VideoFrame::kYPlane],
-          SingleReleaseCallbackImpl::Create(
-              resources.release_callbacks[media::VideoFrame::kYPlane]));
-  ResourceProvider::ResourceId u_resource =
-      resource_provider->CreateResourceFromTextureMailbox(
-          resources.mailboxes[media::VideoFrame::kUPlane],
-          SingleReleaseCallbackImpl::Create(
-              resources.release_callbacks[media::VideoFrame::kUPlane]));
-  ResourceProvider::ResourceId v_resource =
-      resource_provider->CreateResourceFromTextureMailbox(
-          resources.mailboxes[media::VideoFrame::kVPlane],
-          SingleReleaseCallbackImpl::Create(
-              resources.release_callbacks[media::VideoFrame::kVPlane]));
-  ResourceProvider::ResourceId a_resource = 0;
+  ResourceId y_resource = resource_provider->CreateResourceFromTextureMailbox(
+      resources.mailboxes[media::VideoFrame::kYPlane],
+      SingleReleaseCallbackImpl::Create(
+          resources.release_callbacks[media::VideoFrame::kYPlane]));
+  ResourceId u_resource = resource_provider->CreateResourceFromTextureMailbox(
+      resources.mailboxes[media::VideoFrame::kUPlane],
+      SingleReleaseCallbackImpl::Create(
+          resources.release_callbacks[media::VideoFrame::kUPlane]));
+  ResourceId v_resource = resource_provider->CreateResourceFromTextureMailbox(
+      resources.mailboxes[media::VideoFrame::kVPlane],
+      SingleReleaseCallbackImpl::Create(
+          resources.release_callbacks[media::VideoFrame::kVPlane]));
+  ResourceId a_resource = 0;
   if (with_alpha) {
     a_resource = resource_provider->CreateResourceFromTextureMailbox(
         resources.mailboxes[media::VideoFrame::kAPlane],
         SingleReleaseCallbackImpl::Create(
             resources.release_callbacks[media::VideoFrame::kAPlane]));
   }
 
   const gfx::Size ya_tex_size = video_frame->coded_size();
   const gfx::Size uv_tex_size = media::VideoFrame::PlaneSize(
       video_frame->format(), media::VideoFrame::kUPlane,
@@ skipping 1419 matching lines @@
   canvas.clear(SK_ColorTRANSPARENT);
   gfx::Rect rect = mask_rect;
   while (!rect.IsEmpty()) {
     rect.Inset(6, 6, 4, 4);
     canvas.drawRect(
         SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height()),
         paint);
     rect.Inset(6, 6, 4, 4);
   }
 
-  ResourceProvider::ResourceId mask_resource_id =
-      this->resource_provider_->CreateResource(
-          mask_rect.size(), GL_CLAMP_TO_EDGE,
-          ResourceProvider::TEXTURE_HINT_IMMUTABLE, RGBA_8888);
+  ResourceId mask_resource_id = this->resource_provider_->CreateResource(
+      mask_rect.size(), GL_CLAMP_TO_EDGE,
+      ResourceProvider::TEXTURE_HINT_IMMUTABLE, RGBA_8888);
   {
     SkAutoLockPixels lock(bitmap);
     this->resource_provider_->CopyToResource(
         mask_resource_id, reinterpret_cast<uint8_t*>(bitmap.getPixels()),
         mask_rect.size());
   }
 
   // This RenderPassDrawQuad does not include the full |viewport_rect| which is
   // the size of the child render pass.
   gfx::Rect sub_rect = gfx::Rect(50, 50, 200, 100);
@@ skipping 761 matching lines @@
   {
     SkAutoLockPixels lock(bitmap);
     SkCanvas canvas(bitmap);
     canvas.drawPoint(0, 0, SK_ColorGREEN);
     canvas.drawPoint(0, 1, SK_ColorBLUE);
     canvas.drawPoint(1, 0, SK_ColorBLUE);
     canvas.drawPoint(1, 1, SK_ColorGREEN);
   }
 
   gfx::Size tile_size(2, 2);
-  ResourceProvider::ResourceId resource =
-      this->resource_provider_->CreateResource(
-          tile_size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
-          RGBA_8888);
+  ResourceId resource = this->resource_provider_->CreateResource(
+      tile_size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
+      RGBA_8888);
 
   {
     SkAutoLockPixels lock(bitmap);
     this->resource_provider_->CopyToResource(
         resource, static_cast<uint8_t*>(bitmap.getPixels()), tile_size);
   }
 
   RenderPassId id(1, 1);
   gfx::Transform transform_to_root;
   scoped_ptr<RenderPass> pass =
@@ skipping 28 matching lines @@
   {
     SkAutoLockPixels lock(bitmap);
     SkCanvas canvas(bitmap);
     canvas.drawPoint(0, 0, SK_ColorGREEN);
     canvas.drawPoint(0, 1, SK_ColorBLUE);
     canvas.drawPoint(1, 0, SK_ColorBLUE);
     canvas.drawPoint(1, 1, SK_ColorGREEN);
   }
 
   gfx::Size tile_size(2, 2);
-  ResourceProvider::ResourceId resource =
-      this->resource_provider_->CreateResource(
-          tile_size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
-          RGBA_8888);
+  ResourceId resource = this->resource_provider_->CreateResource(
+      tile_size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
+      RGBA_8888);
 
   {
     SkAutoLockPixels lock(bitmap);
     this->resource_provider_->CopyToResource(
         resource, static_cast<uint8_t*>(bitmap.getPixels()), tile_size);
   }
 
   RenderPassId id(1, 1);
   gfx::Transform transform_to_root;
   scoped_ptr<RenderPass> pass =
@@ skipping 29 matching lines @@
   {
     SkAutoLockPixels lock(bitmap);
     SkCanvas canvas(bitmap);
     canvas.drawPoint(0, 0, SK_ColorGREEN);
     canvas.drawPoint(0, 1, SK_ColorBLUE);
     canvas.drawPoint(1, 0, SK_ColorBLUE);
     canvas.drawPoint(1, 1, SK_ColorGREEN);
   }
 
   gfx::Size tile_size(2, 2);
-  ResourceProvider::ResourceId resource =
-      this->resource_provider_->CreateResource(
-          tile_size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
-          RGBA_8888);
+  ResourceId resource = this->resource_provider_->CreateResource(
+      tile_size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
+      RGBA_8888);
 
   {
     SkAutoLockPixels lock(bitmap);
     this->resource_provider_->CopyToResource(
         resource, static_cast<uint8_t*>(bitmap.getPixels()), tile_size);
   }
 
   RenderPassId id(1, 1);
   gfx::Transform transform_to_root;
   scoped_ptr<RenderPass> pass =
@@ skipping 336 matching lines @@
     SkPreMultiplyColor(SkColorSetARGB(255, 0, 128, 0)),
     SkPreMultiplyColor(SkColorSetARGB(255, 0,  64, 0)),
     SkPreMultiplyColor(SkColorSetARGB(255, 0,   0, 0)),
   };
   uint32_t pixels[16] = {
     colors[0], colors[0], colors[1], colors[1],
     colors[0], colors[0], colors[1], colors[1],
     colors[2], colors[2], colors[3], colors[3],
     colors[2], colors[2], colors[3], colors[3],
   };
-  ResourceProvider::ResourceId resource =
-      this->resource_provider_->CreateResource(
-          texture_size, GL_REPEAT, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
-          RGBA_8888);
+  ResourceId resource = this->resource_provider_->CreateResource(
+      texture_size, GL_REPEAT, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
+      RGBA_8888);
   this->resource_provider_->CopyToResource(
       resource, reinterpret_cast<uint8_t*>(pixels), texture_size);
 
   float vertex_opacity[4] = {1.0f, 1.0f, 1.0f, 1.0f};
   TextureDrawQuad* texture_quad =
       pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
   texture_quad->SetNew(
       shared_state, gfx::Rect(this->device_viewport_size_), gfx::Rect(),
       gfx::Rect(this->device_viewport_size_), resource,
       true,                     // premultiplied_alpha
@@ skipping 114 matching lines @@
           ? FILE_PATH_LITERAL("four_blue_green_checkers.png")
           : FILE_PATH_LITERAL("checkers_big.png");
   EXPECT_TRUE(this->RunPixelTest(&pass_list, base::FilePath(path),
                                  ExactPixelComparator(true)));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 }  // namespace cc