diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/WebCore.gyp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/WebCore.gyp')
| -rw-r--r-- | WebCore/WebCore.gyp/WebCore.gyp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp index 16f19d9..4c193cc 100644 --- a/WebCore/WebCore.gyp/WebCore.gyp +++ b/WebCore/WebCore.gyp/WebCore.gyp @@ -726,7 +726,7 @@ '<@(webcore_files)', # For WebCoreSystemInterface, Mac-only. - '../../WebKit/mac/WebCoreSupport/WebSystemInterface.m', + '../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm', ], 'sources/': [ # Exclude JSC custom bindings. @@ -896,6 +896,11 @@ ['exclude', 'rendering/SVG'], ], }], + ['use_accelerated_compositing==1', { + 'dependencies': [ + '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib', + ], + }], ['OS=="linux" or OS=="freebsd"', { 'dependencies': [ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', @@ -1016,7 +1021,7 @@ # Use USE_NEW_THEME on Mac. ['include', 'platform/Theme\\.cpp$'], - ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.m$'], + ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'], ], 'sources!': [ # The Mac uses platform/mac/KillRingMac.mm instead of the dummy |