diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 04:39:26 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 04:39:26 +0000 |
| commit | 11a7c5374fc1a712ca52d012fffc26fc10dd3d93 (patch) | |
| tree | 0a2b40524019254bc4e22f87b9c6503974b55a12 | |
| parent | a412072cf2591462c0db9851ee6d08c4841504c0 (diff) | |
| download | chromium_src-11a7c5374fc1a712ca52d012fffc26fc10dd3d93.zip chromium_src-11a7c5374fc1a712ca52d012fffc26fc10dd3d93.tar.gz chromium_src-11a7c5374fc1a712ca52d012fffc26fc10dd3d93.tar.bz2 | |
Remove default arg from GLES2Implementation's constructor
It was added to pass NaCl integration.
TEST=built chrome, gpu_unittests and DRT
BUG=93019
R=apatrick@chromium.org
Review URL: http://codereview.chromium.org/8588044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112125 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.h | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h index 8594f67..407bd51 100644 --- a/gpu/command_buffer/client/gles2_implementation.h +++ b/gpu/command_buffer/client/gles2_implementation.h @@ -157,7 +157,7 @@ class GLES2Implementation { void* transfer_buffer, int32 transfer_buffer_id, bool share_resources, - bool bind_generates_resource = true); // Will remove in 2 CLs! + bool bind_generates_resource); ~GLES2Implementation(); diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc index 7d92b72..c77902b 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc @@ -229,7 +229,8 @@ bool PluginGraphics3D::InitFromBrowserResource(PP_Resource res) { transfer_buffer.size, transfer_buffer.ptr, transfer_buffer_id, - false)); + false, + true)); return true; } } |