cc: Remove references to managed resources (and cleanup)

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 106 matching lines @@
   ResourceType default_resource_type() const { return default_resource_type_; }
   ResourceType GetResourceType(ResourceId id);
 
   // Creates a resource of the default resource type.
   ResourceId CreateResource(const gfx::Size& size,
                             TextureHint hint,
                             ResourceFormat format);
 
   // Creates a resource for a particular texture target (the distinction between
   // texture targets has no effect in software mode).
-  ResourceId CreateManagedResource(const gfx::Size& size,
-                                   GLenum target,
-                                   TextureHint hint,
-                                   ResourceFormat format);
+  ResourceId CreateResourceWithTextureTarget(const gfx::Size& size,
+                                             GLenum target,
+                                             TextureHint hint,
+                                             ResourceFormat format);
 
-  // You can also explicitly create a specific resource type.
-  ResourceId CreateGLTexture(const gfx::Size& size,
-                             GLenum target,
-                             TextureHint hint,
-                             ResourceFormat format);
-
-  ResourceId CreateBitmap(const gfx::Size& size);
   // Wraps an IOSurface into a GL resource.
   ResourceId CreateResourceFromIOSurface(const gfx::Size& size,
                                          unsigned io_surface_id);
 
   // Wraps an external texture mailbox into a GL resource.
   ResourceId CreateResourceFromTextureMailbox(
       const TextureMailbox& mailbox,
       scoped_ptr<SingleReleaseCallbackImpl> release_callback_impl);
 
   ResourceId CreateResourceFromTextureMailbox(
@@ skipping 290 matching lines @@
  protected:
   ResourceProvider(OutputSurface* output_surface,
                    SharedBitmapManager* shared_bitmap_manager,
                    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
                    BlockingTaskRunner* blocking_main_thread_task_runner,
                    int highp_threshold_min,
                    size_t id_allocation_chunk_size,
                    const std::vector<unsigned>& use_image_texture_targets);
   void Initialize();
 
+  ResourceId CreateGLTexture(const gfx::Size& size,

[danakj, 2015/10/28 20:07:08]

You said private but these are protected, how come?

[ccameron, 2015/10/28 20:12:43]

Oop. Fxied.

+                             GLenum target,
+                             TextureHint hint,
+                             ResourceFormat format);
+
+  ResourceId CreateBitmap(const gfx::Size& size);
+
  private:
   struct Resource {
     enum Origin { INTERNAL, EXTERNAL, DELEGATED };
 
     ~Resource();
     Resource(unsigned texture_id,
              const gfx::Size& size,
              Origin origin,
              GLenum target,
              GLenum filter,
@@ skipping 136 matching lines @@
   // A process-unique ID used for disambiguating memory dumps from different
   // resource providers.
   int tracing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_