Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

ppapi/proxy/ppb_context_3d_proxy.cc

 // Copyright (c) 2011 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_context_3d_proxy.h"
 
 #include "base/hash_tables.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 365 matching lines @@
   gpu::Buffer transfer_buffer =
       command_buffer_->GetTransferBuffer(transfer_buffer_id_);
   if (!transfer_buffer.ptr)
     return false;
 
   gles2_impl_.reset(new gpu::gles2::GLES2Implementation(
       helper_.get(),
       transfer_buffer.size,
       transfer_buffer.ptr,
       transfer_buffer_id_,
-      false));
+      false,
+      true));
 
   return true;
 }
 
 int32_t Context3D::GetAttrib(int32_t attribute, int32_t* value) {
   // TODO(alokp): Implement me.
   return 0;
 }
 
 int32_t Context3D::BindSurfaces(PP_Resource pp_draw, PP_Resource pp_read) {
@@ skipping 322 matching lines @@
   uint32_t shm_size = 0;
   if (enter.succeeded() &&
       enter.object()->GetTransferBuffer(id, &shm_handle, &shm_size)) {
     *transfer_buffer = TransportSHMHandleFromInt(dispatcher(), shm_handle);
     *size = shm_size;
   }
 }
 
 }  // namespace proxy
 }  // namespace pp