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

gpu/gles2_conform_support/egl/display.cc

 // 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.
 
 #include "gpu/gles2_conform_support/egl/display.h"
 
 #include <vector>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
@@ skipping 94 matching lines @@
 
   gl_context_ = gfx::GLContext::CreateGLContext(NULL,
                                                 gl_surface_.get(),
                                                 gfx::PreferDiscreteGpu);
   if (!gl_context_.get())
     return EGL_NO_SURFACE;
 
   std::vector<int32> attribs;
   if (!decoder_->Initialize(gl_surface_.get(),
                             gl_context_.get(),
-                            gl_surface_->IsOffscreen(),
                             gfx::Size(),
                             gpu::gles2::DisallowedFeatures(),
                             NULL,
                             attribs)) {
     return EGL_NO_SURFACE;
   }
 
   command_buffer->SetPutOffsetChangeCallback(
       base::Bind(&gpu::GpuScheduler::PutChanged,
                  base::Unretained(gpu_scheduler_.get())));
@@ skipping 81 matching lines @@
   } else {
     DCHECK(IsValidSurface(draw));
     DCHECK(IsValidSurface(read));
     DCHECK(IsValidContext(ctx));
     gles2::SetGLContext(context_.get());
   }
   return true;
 }
 
 }  // namespace egl