'../build/scripts/scripts.gypi',
'../bindings/core/core.gypi', # core can depend on bindings/core, but not on bindings
'core.gypi',
- '../modules/modules_generated.gypi', # FIXME: Required by <(blink_modules_output_dir) below.
- '../platform/platform_generated.gypi', # FIXME: Required by <(blink_platform_output_dir) below.
],
'variables': {
'webcore_include_dirs': [
'..', # WebKit/Source
- # FIXME: Remove these once core scripts generate qualified
- # includes correctly: http://crbug.com/380054
- '<(blink_core_output_dir)',
- '<(blink_modules_output_dir)',
- '<(bindings_core_v8_output_dir)',
- '<(bindings_modules_v8_output_dir)',
- # Needed to include the generated binding headers.
'<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
],
]
},
{
- # GN version: //third_party/WebKit/Source/core/inspector:inspector_overlay_page
- 'target_name': 'inspector_overlay_page',
- 'type': 'none',
- 'variables': {
- 'input_file_path': 'inspector/InspectorOverlayPage.html',
- 'output_file_path': '<(blink_core_output_dir)/InspectorOverlayPage.h',
- 'character_array_name': 'InspectorOverlayPage_html',
- },
- 'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
- },
- {
- # GN version: //third_party/WebKit/Source/core/inspector:injected_canvas_script_source
- 'target_name': 'injected_canvas_script_source',
- 'type': 'none',
- 'variables': {
- 'input_file_path': 'inspector/InjectedScriptCanvasModuleSource.js',
- 'output_file_path': '<(blink_core_output_dir)/InjectedScriptCanvasModuleSource.h',
- 'character_array_name': 'InjectedScriptCanvasModuleSource_js',
- },
- 'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
- },
- {
- # GN version: //third_party/WebKit/Source/core/inspector:injected_script_source
- 'target_name': 'injected_script_source',
- 'type': 'none',
- 'variables': {
- 'input_file_path': 'inspector/InjectedScriptSource.js',
- 'output_file_path': '<(blink_core_output_dir)/InjectedScriptSource.h',
- 'character_array_name': 'InjectedScriptSource_js',
- },
- 'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
- },
- {
- # GN version: //third_party/WebKit/Source/core/inspector:debugger_script_source
- 'target_name': 'debugger_script_source',
- 'type': 'none',
- 'variables': {
- 'input_file_path': '<(bindings_v8_dir)/DebuggerScript.js',
- 'output_file_path': '<(blink_core_output_dir)/DebuggerScriptSource.h',
- 'character_array_name': 'DebuggerScriptSource_js',
- },
- 'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
- },
- {
# GN version: //third_party/WebKit/Source/core:core_generated
'target_name': 'webcore_generated',
'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
'core_generated.gyp:make_core_generated',
- 'inspector_overlay_page',
'inspector_protocol_sources',
'inspector_instrumentation_sources',
- 'injected_canvas_script_source',
- 'injected_script_source',
- 'debugger_script_source',
'../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
# FIXME: don't depend on bindings_modules http://crbug.com/358074
'../bindings/modules/generated.gyp:modules_event_generated',
],
'sources': [
# FIXME: should be bindings_core_v8_files http://crbug.com/358074
- '<@(bindings_v8_files)',
+ '<@(bindings_core_v8_files)',
# These files include all the .cpp files generated from the .idl files
# in webcore_files.
'<@(bindings_core_v8_generated_aggregate_files)',
# Generated from make_style_builder.py
'<(blink_core_output_dir)/StyleBuilder.cpp',
'<(blink_core_output_dir)/StyleBuilderFunctions.cpp',
+
+ # Generated from make_css_property_metadata.py
+ '<(blink_core_output_dir)/CSSPropertyMetadata.cpp',
],
'conditions': [
['OS=="win" and component=="shared_library"', {
['OS=="win"', {
# In generated bindings code: 'switch contains default but no case'.
# Disable c4267 warnings until we fix size_t to int truncations.
- # 4702 is disabled because of issues in Bison-generated
+ # 4701 and 4702 are disabled because of issues in Bison-generated
# XPathGrammar.cpp and CSSGrammar.cpp.
- 'msvs_disabled_warnings': [ 4065, 4267, 4702 ],
+ 'msvs_disabled_warnings': [ 4065, 4267, 4701, 4702 ],
}],
['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
'cflags': [
'target_name': 'webcore_prerequisites',
'type': 'none',
'dependencies': [
- 'debugger_script_source',
- 'injected_canvas_script_source',
- 'injected_script_source',
- 'inspector_overlay_page',
'inspector_protocol_sources',
'inspector_instrumentation_sources',
'core_generated.gyp:make_core_generated',
'xcode_settings': {
# Some Mac-specific parts of WebKit won't compile without having this
# prefix header injected.
- # FIXME: make this a first-class setting.
- 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h',
+ 'GCC_PREFIX_HEADER': '<(DEPTH)/third_party/WebKit/Source/build/mac/Prefix.h',
},
},
'conditions': [
'class_whitelist_regex':
'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView|ScrollerStyleObserver',
'category_whitelist_regex':
- 'TCMInterposing|ScrollAnimatorChromiumMacExt|WebCoreTheme',
+ 'WebCoreFocusRingDrawing|WebCoreTheme',
},
'action': [
'../build/scripts/check_objc_rename.sh',
['exclude', '.*'],
['include', 'rendering/'],
- # FIXME: Figure out how to store these patterns in a variable.
- ['exclude', '(cf|cg|mac|opentype|svg|win)/'],
['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'],
# Previous rule excludes things like ChromiumFooWin, include those.
['include', 'rendering/.*Chromium.*\\.(cpp|mm?)$'],
'sources/': [
['exclude', 'rendering/'],
- # FIXME: Figure out how to store these patterns in a variable.
- ['exclude', '(cf|cg|mac|opentype|svg|win)/'],
['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'],
],
'conditions': [
],
},
{
+ # GN version: //third_party/WebKit/Source/core:testing
'target_name': 'webcore_testing',
'type': 'static_library',
'dependencies': [
'INSIDE_BLINK',
],
'include_dirs': [
- '<(bindings_v8_dir)', # FIXME: Remove once http://crbug.com/236119 is fixed.
+ '<(bindings_core_v8_dir)', # FIXME: Remove once http://crbug.com/236119 is fixed.
'testing',
'testing/v8',
],
'sources': [
+ # Note: file list duplicated in GN build.
'<@(webcore_testing_files)',
+ '<(bindings_core_v8_output_dir)/V8GarbageCollectedScriptWrappable.cpp',
+ '<(bindings_core_v8_output_dir)/V8GarbageCollectedScriptWrappable.h',
'<(bindings_core_v8_output_dir)/V8GCObservation.cpp',
'<(bindings_core_v8_output_dir)/V8GCObservation.h',
- '<(bindings_core_v8_output_dir)/V8MallocStatistics.cpp',
- '<(bindings_core_v8_output_dir)/V8MallocStatistics.h',
+ '<(bindings_core_v8_output_dir)/V8PrivateScriptTest.cpp',
+ '<(bindings_core_v8_output_dir)/V8PrivateScriptTest.h',
'<(bindings_core_v8_output_dir)/V8TypeConversions.cpp',
'<(bindings_core_v8_output_dir)/V8TypeConversions.h',
'<(bindings_core_v8_output_dir)/V8Internals.cpp',
'<(bindings_core_v8_output_dir)/V8LayerRect.h',
'<(bindings_core_v8_output_dir)/V8LayerRectList.cpp',
'<(bindings_core_v8_output_dir)/V8LayerRectList.h',
+ '<(bindings_core_v8_output_dir)/V8RefCountedScriptWrappable.cpp',
+ '<(bindings_core_v8_output_dir)/V8RefCountedScriptWrappable.h',
],
'sources/': [
['exclude', 'testing/js'],
projects / platform / framework / web / crosswalk.git / blobdiff