ContextProvider in OutputSurface

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 45 matching lines @@
   static scoped_ptr<ResourceProvider> Create(OutputSurface* output_surface,
                                              int highp_threshold_min);
 
   virtual ~ResourceProvider();
 
   void InitializeSoftware();
   bool InitializeGL();
 
   void DidLoseOutputSurface() { lost_output_surface_ = true; }
 
-  WebKit::WebGraphicsContext3D* GraphicsContext3D();
   int max_texture_size() const { return max_texture_size_; }
   GLenum best_texture_format() const { return best_texture_format_; }
   size_t num_resources() const { return resources_.size(); }
 
   // Checks whether a resource is in use by a consumer.
   bool InUseByConsumer(ResourceId id);
 
 
   // Producer interface.
 
@@ skipping 240 matching lines @@
     current_read_lock_fence_ = fence;
   }
   Fence* GetReadLockFence() { return current_read_lock_fence_.get(); }
 
   // Enable read lock fences for a specific resource.
   void EnableReadLockFences(ResourceProvider::ResourceId id, bool enable);
 
   // Indicates if we can currently lock this resource for write.
   bool CanLockForWrite(ResourceId id);
 
-  cc::ContextProvider* offscreen_context_provider() {
+  ContextProvider* offscreen_context_provider() {
     return offscreen_context_provider_.get();
   }
   void set_offscreen_context_provider(
-      scoped_refptr<cc::ContextProvider> offscreen_context_provider) {
+      scoped_refptr<ContextProvider> offscreen_context_provider) {
     offscreen_context_provider_ = offscreen_context_provider;
   }
   static GLint GetActiveTextureUnit(WebKit::WebGraphicsContext3D* context);
 
  private:
   struct Resource {
     Resource();
     ~Resource();
     Resource(unsigned texture_id,
              gfx::Size size,
@@ skipping 72 matching lines @@
   // specified filter for both minification and magnification. The resource
   // must be locked for reading.
   void BindForSampling(ResourceProvider::ResourceId resource_id,
                        GLenum target,
                        GLenum unit,
                        GLenum filter);
   void UnbindForSampling(ResourceProvider::ResourceId resource_id,
                          GLenum target,
                          GLenum unit);
 
+  // Returns NULL if the output_surface_ does not have a ContextProvider.
+  WebKit::WebGraphicsContext3D* Context3d() const;
+
   OutputSurface* output_surface_;
   bool lost_output_surface_;
   int highp_threshold_min_;
   ResourceId next_id_;
   ResourceMap resources_;
   int next_child_;
   ChildMap children_;
 
   ResourceType default_resource_type_;
   bool use_texture_storage_ext_;
   bool use_texture_usage_hint_;
   bool use_shallow_flush_;
   scoped_ptr<TextureUploader> texture_uploader_;
   int max_texture_size_;
   GLenum best_texture_format_;
 
   scoped_refptr<cc::ContextProvider> offscreen_context_provider_;
 
   base::ThreadChecker thread_checker_;
 
   scoped_refptr<Fence> current_read_lock_fence_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_