GLContext no longer holds a pointer to a GLSurface.

gpu/command_buffer/service/gpu_scheduler.h

 // Copyright (c) 2011 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 GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_
 
 #include <queue>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/cmd_parser.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 #if defined(OS_MACOSX)
 #include "ui/gfx/surface/accelerated_surface_mac.h"
 #endif
 
 namespace gfx {
 class GLContext;
+class GLSurface;
 }
 
 namespace gpu {
 namespace gles2 {
 class ContextGroup;
 }
 
 // This class processes commands in a command buffer. It is event driven and
 // posts tasks to the current message loop to do additional work.
 class GpuScheduler : public CommandBufferEngine {
@@ skipping 88 matching lines @@
   // The bool parameter will be true for SetLatch, and false for a WaitLatch
   // that is blocked. An unblocked WaitLatch will not trigger a callback.
   void SetLatchCallback(const base::Callback<void(bool)>& callback) {
     decoder_->SetLatchCallback(callback);
   }
 
   // Get the GLES2Decoder associated with this scheduler.
   gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
 
  protected:
-  // Perform common initialization. Takes ownership of GLContext.
+  // Perform common initialization. Takes ownership of GLSurface and GLContext.
   bool InitializeCommon(
+      gfx::GLSurface* surface,
       gfx::GLContext* context,
       const gfx::Size& size,
       const gles2::DisallowedExtensions& disallowed_extensions,
       const char* allowed_extensions,
       const std::vector<int32>& attribs,
       gles2::GLES2Decoder* parent_decoder,
       uint32 parent_texture_id);
 
 
  private:
@@ skipping 27 matching lines @@
 #endif
 
   ScopedRunnableMethodFactory<GpuScheduler> method_factory_;
   scoped_ptr<Callback0::Type> wrapped_swap_buffers_callback_;
   scoped_ptr<Callback0::Type> command_processed_callback_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_