summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.gypi
diff options
context:
space:
mode:
authorjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 00:43:15 +0000
committerjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 00:43:15 +0000
commit0b537a44c49a3ce217d7e21befd84224d089d588 (patch)
treed674da2bfd5189f1b23fe359dd760e9188ba7299 /webkit/glue/webkit_glue.gypi
parentbb837f9287259862c94155cc59cfc9e1bdfe1258 (diff)
downloadchromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.zip
chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.tar.gz
chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.tar.bz2
Revert 76840 - Removed GPU plugin.
Pepper 3D v2 does not use the GPU plugin. It is integrated with the accelerated compositor. TEST=PPAPI 3D v2 still works, trybots BUG=none Review URL: http://codereview.chromium.org/6588090 TBR=apatrick@chromium.org Review URL: http://codereview.chromium.org/6614030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.gypi')
-rw-r--r--webkit/glue/webkit_glue.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index e662392..45ca5db 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -510,6 +510,11 @@
'../plugins/ppapi/ppb_open_gl_es_impl.cc',
],
}],
+ ['enable_gpu==1', {
+ 'dependencies': [
+ '<(DEPTH)/gpu/gpu.gyp:gpu_plugin',
+ ],
+ }],
['OS!="win"', {
'sources/': [['exclude', '_win\\.cc$']],
'sources!': [