diff options
Diffstat (limited to 'WebKit/chromium/WebKit.gyp')
| -rw-r--r-- | WebKit/chromium/WebKit.gyp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp index 3612a08..9385778 100644 --- a/WebKit/chromium/WebKit.gyp +++ b/WebKit/chromium/WebKit.gyp @@ -30,7 +30,7 @@ { 'includes': [ - '../../WebCore/WebCore.gypi', + '../../Source/WebCore/WebCore.gypi', '../../Tools/DumpRenderTree/DumpRenderTree.gypi', 'WebKit.gypi', 'features.gypi', @@ -73,7 +73,7 @@ 'target_name': 'webkit', 'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65', 'dependencies': [ - '../../WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', '<(chromium_src_dir)/app/app.gyp:app_base', # For GLContext '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', @@ -101,6 +101,7 @@ 'public/mac/WebInputEventFactory.h', 'public/mac/WebSandboxSupport.h', 'public/mac/WebScreenInfoFactory.h', + 'public/mac/WebThemeEngine.h', 'public/WebAccessibilityCache.h', 'public/WebAccessibilityNotification.h', 'public/WebAccessibilityObject.h', @@ -110,6 +111,8 @@ 'public/WebApplicationCacheHostClient.h', 'public/WebAttribute.h', 'public/WebAudioBus.h', + 'public/WebAudioDevice.h', + 'public/WebAutoFillClient.h', 'public/WebBindings.h', 'public/WebBlobData.h', 'public/WebBlobRegistry.h', @@ -303,6 +306,8 @@ 'src/AsyncFileSystemChromium.h', 'src/AsyncFileWriterChromium.cpp', 'src/AsyncFileWriterChromium.h', + 'src/AudioDestinationChromium.cpp', + 'src/AudioDestinationChromium.h', 'src/AutoFillPopupMenuClient.cpp', 'src/AutoFillPopupMenuClient.h', 'src/BackForwardListClientImpl.cpp', @@ -586,7 +591,7 @@ 'WEBKIT_DLL', ], 'dependencies': [ - '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings', + '../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings', '<(chromium_src_dir)/base/base.gyp:test_support_base', '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/testing/gtest.gyp:gtest', @@ -697,7 +702,7 @@ 'type': 'none', 'dependencies': [ 'devtools_html', - '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources', + '../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources', ], 'conditions': [ ['debug_devtools==0', { @@ -738,7 +743,7 @@ 'scripts/generate_devtools_html.py', # See issue 29695: WebKit.gypi is a source file for devtools.html. 'WebKit.gypi', - '../../WebCore/inspector/front-end/inspector.html', + '../../Source/WebCore/inspector/front-end/inspector.html', ], 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'], 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(debug_devtools)', '<@(devtools_files)'], @@ -749,13 +754,13 @@ 'type': 'none', 'dependencies': [ 'devtools_html', - '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources' + '../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources' ], 'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'], 'actions': [{ 'action_name': 'concatenate_devtools_js', 'script_name': 'scripts/concatenate_js_files.py', - 'input_page': '../../WebCore/inspector/front-end/inspector.html', + 'input_page': '../../Source/WebCore/inspector/front-end/inspector.html', 'inputs': [ '<@(_script_name)', '<@(_input_page)', @@ -764,7 +769,7 @@ '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js' ], 'search_path': [ - '../../WebCore/inspector/front-end', + '../../Source/WebCore/inspector/front-end', 'src/js', '<(SHARED_INTERMEDIATE_DIR)/webcore', ], @@ -782,7 +787,7 @@ 'actions': [{ 'action_name': 'concatenate_devtools_css', 'script_name': 'scripts/concatenate_css_files.py', - 'input_page': '../../WebCore/inspector/front-end/inspector.html', + 'input_page': '../../Source/WebCore/inspector/front-end/inspector.html', 'inputs': [ '<@(_script_name)', '<@(_input_page)', @@ -790,7 +795,7 @@ '<@(devtools_files)' ], 'search_path': [ - '../../WebCore/inspector/front-end', + '../../Source/WebCore/inspector/front-end', 'src/js', ], 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devTools.css'], @@ -803,7 +808,7 @@ 'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD', 'dependencies': [ 'webkit', - '../../WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', '<(chromium_src_dir)/testing/gtest.gyp:gtest', '<(chromium_src_dir)/base/base.gyp:base', '<(chromium_src_dir)/base/base.gyp:base_i18n', @@ -879,11 +884,11 @@ 'type': 'executable', 'dependencies': [ 'webkit', - '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', + '../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', ], 'include_dirs': [ - '../../JavaScriptCore', + '../../Source/JavaScriptCore', '<(DEPTH)', ], 'sources': [ @@ -900,7 +905,7 @@ 'TestNetscapePlugIn', 'copy_TestNetscapePlugIn', 'webkit', - '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config', + '../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config', '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc', '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa', '<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob', @@ -909,8 +914,8 @@ 'include_dirs': [ '<(chromium_src_dir)', 'public', - '../../JavaScriptCore', - '../../JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/. + '../../Source/JavaScriptCore', + '../../Source/JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/. '<(DEPTH)', ], 'defines': [ @@ -942,7 +947,7 @@ 'public', ], 'dependencies': [ - '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', + '../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', ], }], ['inside_chromium_build==1', { |