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

gpu/demos/framework/window.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/demos/framework/window.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 76 matching lines @@
     return false;
 
   context_ = gfx::GLContext::CreateGLContext(
       NULL, surface_.get(), gfx::PreferDiscreteGpu);
   if (!context_.get())
     return false;
 
   std::vector<int32> attribs;
   if (!decoder_->Initialize(surface_.get(),
                             context_.get(),
-                            surface_->IsOffscreen(),
                             gfx::Size(),
                             gpu::gles2::DisallowedFeatures(),
                             NULL,
                             attribs)) {
     return false;
   }
 
   command_buffer_->SetPutOffsetChangeCallback(
       base::Bind(&GpuScheduler::PutChanged,
                  base::Unretained(gpu_scheduler_.get())));
@@ skipping 22 matching lines @@
       kTransferBufferSize,
       kTransferBufferSize)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace demos
 }  // namespace gpu