Revert of pepper: parse context creation attrib list on the plugin side

ppapi/proxy/ppb_graphics_3d_proxy.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 "ppapi/proxy/ppb_graphics_3d_proxy.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
@@ skipping 154 matching lines @@
     EnterResourceNoLock<PPB_Graphics3D_API> enter(share_context, true);
     if (enter.failed())
       return PP_ERROR_BADARGUMENT;
 
     PPB_Graphics3D_Shared* share_graphics =
         static_cast<PPB_Graphics3D_Shared*>(enter.object());
     share_host = share_graphics->host_resource();
     share_gles2 = share_graphics->gles2_impl();
   }
 
-  gpu::gles2::ContextCreationAttribHelper attrib_helper;
   std::vector<int32_t> attribs;
   if (attrib_list) {
-    for (const int32_t* attr = attrib_list; attr[0] != PP_GRAPHICS3DATTRIB_NONE;
+    for (const int32_t* attr = attrib_list;
+         attr[0] != PP_GRAPHICS3DATTRIB_NONE;
          attr += 2) {
-      switch (attr[0]) {
-        case PP_GRAPHICS3DATTRIB_WIDTH:
-          attrib_helper.offscreen_framebuffer_size.set_width(attr[1]);
-          break;
-        case PP_GRAPHICS3DATTRIB_HEIGHT:
-          attrib_helper.offscreen_framebuffer_size.set_height(attr[1]);
-          break;
-        case PP_GRAPHICS3DATTRIB_GPU_PREFERENCE:
-          attrib_helper.gpu_preference =
-              (attr[1] == PP_GRAPHICS3DATTRIB_GPU_PREFERENCE_LOW_POWER)
-                  ? gl::PreferIntegratedGpu
-                  : gl::PreferDiscreteGpu;
-          break;
-        default:
-          attribs.push_back(attr[0]);
-          attribs.push_back(attr[1]);
-          break;
-      }
+      attribs.push_back(attr[0]);
+      attribs.push_back(attr[1]);
     }
-    attribs.push_back(PP_GRAPHICS3DATTRIB_NONE);
   }
-  if (!attrib_helper.Parse(attribs))
-    return 0;
+  attribs.push_back(PP_GRAPHICS3DATTRIB_NONE);
 
   HostResource result;
   gpu::Capabilities capabilities;
   ppapi::proxy::SerializedHandle shared_state;
   gpu::CommandBufferId command_buffer_id;
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics3D_Create(
-      API_ID_PPB_GRAPHICS_3D, instance, share_host, attrib_helper, &result,
-      &capabilities, &shared_state, &command_buffer_id));
+  dispatcher->Send(new PpapiHostMsg_PPBGraphics3D_Create(API_ID_PPB_GRAPHICS_3D,
+        instance, share_host, attribs, &result, &capabilities, &shared_state,
+        &command_buffer_id));
 
   if (result.is_null())
     return 0;
 
   scoped_refptr<Graphics3D> graphics_3d(new Graphics3D(result));
   if (!graphics_3d->Init(share_gles2, capabilities, shared_state,
                          command_buffer_id)) {
     return 0;
   }
   return graphics_3d->GetReference();
@@ skipping 30 matching lines @@
 
   IPC_END_MESSAGE_MAP()
   // FIXME(brettw) handle bad messages!
   return handled;
 }
 
 #if !defined(OS_NACL)
 void PPB_Graphics3D_Proxy::OnMsgCreate(
     PP_Instance instance,
     HostResource share_context,
-    const gpu::gles2::ContextCreationAttribHelper& attrib_helper,
+    const std::vector<int32_t>& attribs,
     HostResource* result,
     gpu::Capabilities* capabilities,
     SerializedHandle* shared_state,
     gpu::CommandBufferId* command_buffer_id) {
   shared_state->set_null_shmem();
+  if (attribs.empty() ||
+      attribs.back() != PP_GRAPHICS3DATTRIB_NONE ||
+      !(attribs.size() & 1))
+    return;  // Bad message.
 
   thunk::EnterResourceCreation enter(instance);
 
   if (!enter.succeeded())
     return;
 
   base::SharedMemoryHandle handle = base::SharedMemory::NULLHandle();
   result->SetHostResource(
-      instance, enter.functions()->CreateGraphics3DRaw(
-                    instance, share_context.host_resource(), attrib_helper,
-                    capabilities, &handle, command_buffer_id));
+      instance,
+      enter.functions()->CreateGraphics3DRaw(instance,
+                                             share_context.host_resource(),
+                                             &attribs.front(),
+                                             capabilities,
+                                             &handle,
+                                             command_buffer_id));
   if (!result->is_null()) {
     shared_state->set_shmem(TransportSHMHandle(dispatcher(), handle),
                             sizeof(gpu::CommandBuffer::State));
   }
 }
 
 void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer(const HostResource& context,
                                              int32_t transfer_buffer_id) {
   EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
   if (enter.succeeded())
@@ skipping 102 matching lines @@
 void PPB_Graphics3D_Proxy::SendSwapBuffersACKToPlugin(
     int32_t result,
     const HostResource& context) {
   dispatcher()->Send(new PpapiMsg_PPBGraphics3D_SwapBuffersACK(
       API_ID_PPB_GRAPHICS_3D, context, result));
 }
 #endif  // !defined(OS_NACL)
 
 }  // namespace proxy
 }  // namespace ppapi