Ignore custom offscreen surface unless explicitly opted in

gpu/ipc/service/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.
 
 #include "gpu/ipc/service/gpu_command_buffer_stub.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 637 matching lines @@
   sync_point_client_ = base::MakeUnique<SyncPointClient>(
       channel_->sync_point_manager(),
       channel_->GetSyncPointOrderData(stream_id_),
       CommandBufferNamespace::GPU_IO, command_buffer_id_);
 
   executor_->SetPreemptByFlag(channel_->preempted_flag());
 
   decoder_->set_engine(executor_.get());
 
   if (offscreen) {
+#if defined(OS_ANDROID)
+    // This code isn't really platform specific, but apparently NaCl
+    // plugins on Ozone requested custom attributes for offscreen
+    // surfaces even though there is no implementation to apply these
+    // features. For now, continue ignoring the attributes for

[jbauman, 2017/03/21 00:51:41]

I think what's happening with NaCL is that the GLES2CmdDecoder uses the params
to create its offscreen backbuffer. That's normally how this is supposed to work
- offscreen command-buffers create textures and draw on them, rather than using
the surface itself. So we should be using some sort of flag to say that it's
actually going to draw into Surface rather into its own texture.

+    // backwards compatibility. TODO(klausw,crbug.com/699664): remove
+    // the Android conditional once it's generally supported, and/or
+    // add a separate use_own_surface boolean attribute to make this
+    // explicitly opt-in.
     if (init_params.attribs.depth_size > 0) {
       surface_format.SetDepthBits(init_params.attribs.depth_size);
     }
     if (init_params.attribs.samples > 0) {
       surface_format.SetSamples(init_params.attribs.samples);
     }
     if (init_params.attribs.stencil_size > 0) {
       surface_format.SetStencilBits(init_params.attribs.stencil_size);
     }
+#endif
     // Currently, we can't separately control alpha channel for surfaces,
     // it's generally enabled by default except for RGB565 and (on desktop)
     // smaller-than-32bit formats.
     //
     // TODO(klausw): use init_params.attribs.alpha_size here if possible.
     if (!surface_format.IsCompatible(default_surface->GetFormat())) {
       DVLOG(1) << __FUNCTION__ << ": Hit the OwnOffscreenSurface path";
       use_virtualized_gl_context_ = false;
       surface_ = gl::init::CreateOffscreenGLSurfaceWithFormat(gfx::Size(),
                                                               surface_format);
@@ skipping 551 matching lines @@
       command_buffer_->GetLastState().error == error::kLostContext)
     return;
 
   command_buffer_->SetContextLostReason(error::kUnknown);
   if (decoder_)
     decoder_->MarkContextLost(error::kUnknown);
   command_buffer_->SetParseError(error::kLostContext);
 }
 
 }  // namespace gpu