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

content/common/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 273 matching lines @@
     decoder_.reset();
 
     DLOG(ERROR) << "Failed to create context.\n";
     OnInitializeFailed(reply_message);
     return;
   }
 
   // Initialize the decoder with either the view or pbuffer GLContext.
   if (!decoder_->Initialize(surface_.get(),
                             context_.get(),
-                            !surface_id(),
                             initial_size_,
                             disallowed_features_,
                             allowed_extensions_.c_str(),
                             requested_attribs_)) {
     DLOG(ERROR) << "Failed to initialize decoder.";
     OnInitializeFailed(reply_message);
     return;
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 332 matching lines @@
 }
 
 void GpuCommandBufferStub::SetMemoryAllocation(
     const GpuMemoryAllocation& allocation) {
   allocation_ = allocation;
 
   SendMemoryAllocationToProxy(allocation);
 }
 
 #endif  // defined(ENABLE_GPU)