command_buffer: Add support for creating non-WebGL ES 3 contexts

gpu/command_buffer/service/framebuffer_manager.h

 // Copyright (c) 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 GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 237 matching lines @@
     virtual ~TextureDetachObserver();
 
     virtual void OnTextureRefDetachedFromFramebuffer(TextureRef* texture) = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(TextureDetachObserver);
   };
 
   FramebufferManager(uint32 max_draw_buffers,
                      uint32 max_color_attachments,
-                     ContextGroup::ContextType context_type,
+                     ContextType context_type,
                      const scoped_refptr<FramebufferCompletenessCache>&
                          framebuffer_combo_complete_cache);
   ~FramebufferManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a Framebuffer for the given framebuffer.
   void CreateFramebuffer(GLuint client_id, GLuint service_id);
 
@@ skipping 26 matching lines @@
   }
 
   void RemoveObserver(TextureDetachObserver* observer) {
     texture_detach_observers_.erase(
         std::remove(texture_detach_observers_.begin(),
                     texture_detach_observers_.end(),
                     observer),
         texture_detach_observers_.end());
   }
 
-  ContextGroup::ContextType context_type() const {
-    return context_type_;
-  }
+  ContextType context_type() const { return context_type_; }
 
  private:
   friend class Framebuffer;
 
   void StartTracking(Framebuffer* framebuffer);
   void StopTracking(Framebuffer* framebuffer);
 
   void OnTextureRefDetached(TextureRef* texture);
 
   FramebufferCompletenessCache* GetFramebufferComboCompleteCache() {
@@ skipping 11 matching lines @@
 
   // Counts the number of Framebuffer allocated with 'this' as its manager.
   // Allows to check no Framebuffer will outlive this.
   unsigned int framebuffer_count_;
 
   bool have_context_;
 
   uint32 max_draw_buffers_;
   uint32 max_color_attachments_;
 
-  ContextGroup::ContextType context_type_;
+  ContextType context_type_;
 
   typedef std::vector<TextureDetachObserver*> TextureDetachObserverVector;
   TextureDetachObserverVector texture_detach_observers_;
 
   scoped_refptr<FramebufferCompletenessCache> framebuffer_combo_complete_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(FramebufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_