summaryrefslogtreecommitdiffstats
path: root/o3d/build
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 18:16:07 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 18:16:07 +0000
commitcdec6ce6b720d9fffb7ef2a7999a3166e7c3dd26 (patch)
tree598f7d7944161c224413f704b843dfd7d8216c53 /o3d/build
parentbfe4c158cd0372fa7a602997f65b42a92645aaf3 (diff)
downloadchromium_src-cdec6ce6b720d9fffb7ef2a7999a3166e7c3dd26.zip
chromium_src-cdec6ce6b720d9fffb7ef2a7999a3166e7c3dd26.tar.gz
chromium_src-cdec6ce6b720d9fffb7ef2a7999a3166e7c3dd26.tar.bz2
Replaced SharedMemory::Map method with NPN_MapMemory.
Moved responsibility for mapping ring buffer into GPUProcessor. Removed SharedMemory::SetInt32 and SetFloat. Implemented GetWindowNPObject in WebKitNHPBrowser. TEST=none BUG=none Review URL: http://codereview.chromium.org/246069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
-rw-r--r--o3d/build/common.gypi14
1 files changed, 7 insertions, 7 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 69c2081..ffc1f86 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -40,16 +40,16 @@
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
},
}],
+ ['o3d_in_chrome == 1',
+ {
+ 'defines': [
+ 'O3D_IN_CHROME',
+ ],
+ },
+ ],
],
},
'conditions' : [
- ['o3d_in_chrome == 1',
- {
- 'defined': [
- 'O3D_IN_CHROME',
- ],
- },
- ],
['OS == "win"',
{
'variables': {