Merge 131559 - Revert 131177 - aura: Change shared context to be offscreen for arm

gpu/command_buffer/service/gles2_cmd_decoder.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.
 
 // This file contains the GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
 #include <vector>
@@ skipping 69 matching lines @@
   void set_log_synthesized_gl_errors(bool enabled) {
     log_synthesized_gl_errors_ = enabled;
   }
 
   // Initializes the graphics context. Can create an offscreen
   // decoder with a frame buffer that can be referenced from the parent.
   // Takes ownership of GLContext.
   // Parameters:
   //  surface: the GL surface to render to.
   //  context: the GL context to render to.
-  //  offscreen: whether to make the context offscreen or not. When FBO 0 is
-  //      bound, offscreen contexts render to an internal buffer, onscreen ones
-  //      to the surface.
   //  size: the size if the GL context is offscreen.
   //  allowed_extensions: A string in the same format as
   //      glGetString(GL_EXTENSIONS) that lists the extensions this context
   //      should allow. Passing NULL or "*" means allow all extensions.
   // Returns:
   //   true if successful.
   virtual bool Initialize(const scoped_refptr<gfx::GLSurface>& surface,
                           const scoped_refptr<gfx::GLContext>& context,
-                          bool offscreen,
                           const gfx::Size& size,
                           const DisallowedFeatures& disallowed_features,
                           const char* allowed_extensions,
                           const std::vector<int32>& attribs) = 0;
 
   // Destroys the graphics context.
   virtual void Destroy() = 0;
 
   virtual bool SetParent(GLES2Decoder* parent_decoder,
                          uint32 parent_texture_id) = 0;
@@ skipping 70 matching lines @@
   bool log_synthesized_gl_errors_;
   static bool testing_force_is_angle_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_