summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.gypi
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-05 00:24:58 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-05 00:24:58 +0000
commitd7f0642692c2ac6de15cd1e713e0c88dd740b58e (patch)
tree43a5c7a0b91b538933f115a16a6618f6d411a693 /webkit/glue/webkit_glue.gypi
parent8ba903e43de0e0a0953aa16b878c6279931fffb9 (diff)
downloadchromium_src-d7f0642692c2ac6de15cd1e713e0c88dd740b58e.zip
chromium_src-d7f0642692c2ac6de15cd1e713e0c88dd740b58e.tar.gz
chromium_src-d7f0642692c2ac6de15cd1e713e0c88dd740b58e.tar.bz2
Remove support for client side arrays from client side gpu
code used by Chromium and WebGL so that you can't use it by accident. It's stil enabled for Pepper, the conformance tests and the unit tests. Note that bug 71717 was a bug in WebGL. The same call to glDrawElements with the same parameters would have also crashed real OpenGL. The reason it didn't with --in-process-webgl is because some checks were used with that flag that were not without. Mo is fixing that side. Also, I made it so the the GLES2Implementation class is always the same. Otherwise code calling it needed to have the same flags. BUG=71717 TEST=none Review URL: http://codereview.chromium.org/6410092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.gypi')
-rw-r--r--webkit/glue/webkit_glue.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 6f55a21..2f04e5f 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -188,7 +188,7 @@
'dependencies': [
'<(DEPTH)/app/app.gyp:app_base',
'<(DEPTH)/base/base.gyp:base_i18n',
- '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
+ '<(DEPTH)/gpu/gpu.gyp:gles2_implementation_client_side_arrays',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_shared_impl',
'<(DEPTH)/printing/printing.gyp:printing',
@@ -512,7 +512,7 @@
'sources/': [['exclude', '_mac\\.(cc|mm)$']],
'sources!': [
'webthemeengine_impl_mac.cc',
- ],
+ ],
}, { # else: OS=="mac"
'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
'link_settings': {