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

webkit/plugins/ppapi/ppb_context_3d_impl.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 "webkit/plugins/ppapi/ppb_context_3d_impl.h"
 
 #include "base/logging.h"
 #include "base/shared_memory.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
@@ skipping 315 matching lines @@
       command_buffer->GetTransferBuffer(transfer_buffer_id_);
   if (!transfer_buffer.ptr)
     return false;
 
   // Create the object exposing the OpenGL API.
   gles2_impl_.reset(new gpu::gles2::GLES2Implementation(
       helper_.get(),
       transfer_buffer.size,
       transfer_buffer.ptr,
       transfer_buffer_id_,
-      false));
+      false,
+      true));
 
   return true;
 }
 
 void PPB_Context3D_Impl::Destroy() {
   if (draw_surface_)
     draw_surface_->BindToContext(NULL);
 
   gles2_impl_.reset();
 
   if (platform_context_.get() && transfer_buffer_id_ != 0) {
     platform_context_->GetCommandBuffer()->DestroyTransferBuffer(
         transfer_buffer_id_);
     transfer_buffer_id_ = 0;
   }
 
   helper_.reset();
   platform_context_.reset();
 }
 
 void PPB_Context3D_Impl::OnContextLost() {
   if (draw_surface_)
     draw_surface_->OnContextLost();
   if (read_surface_)
     read_surface_->OnContextLost();
 }
 
 }  // namespace ppapi
 }  // namespace webkit