Revert of Pass initial size and GPU preference via context attributes

gpu/gles2_conform_support/egl/context.cc

 // Copyright (c) 2016 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/context.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
@@ skipping 277 matching lines @@
   gpu::gles2::ContextCreationAttribHelper helper;
   config_->GetAttrib(EGL_ALPHA_SIZE, &helper.alpha_size);
   config_->GetAttrib(EGL_DEPTH_SIZE, &helper.depth_size);
   config_->GetAttrib(EGL_STENCIL_SIZE, &helper.stencil_size);
 
   helper.buffer_preserved = false;
   helper.bind_generates_resource = kBindGeneratesResources;
   helper.fail_if_major_perf_caveat = false;
   helper.lose_context_when_out_of_memory = kLoseContextWhenOutOfMemory;
   helper.context_type = gpu::gles2::CONTEXT_TYPE_OPENGLES2;
-  helper.offscreen_framebuffer_size = gl_surface->GetSize();
 
   if (!decoder->Initialize(gl_surface, gl_context.get(),
-                           gl_surface->IsOffscreen(),
+                           gl_surface->IsOffscreen(), gl_surface->GetSize(),
                            gpu::gles2::DisallowedFeatures(), helper)) {
     return false;
   }
 
   command_buffer->SetPutOffsetChangeCallback(
       base::Bind(&gpu::CommandExecutor::PutChanged,
                  base::Unretained(command_executor.get())));
   command_buffer->SetGetBufferChangeCallback(
       base::Bind(&gpu::CommandExecutor::SetGetBuffer,
                  base::Unretained(command_executor.get())));
@@ skipping 81 matching lines @@
     return false;
   if (!gl_context_->MakeCurrent(gl_surface)) {
     MarkServiceContextLost();
     return false;
   }
   client_gl_context_->Flush();
   return true;
 }
 
 }  // namespace egl