Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Side by Side Diff: Source/core/core.gyp

Issue 23889035: Move WEBCORE_NAVIGATOR macros defaults from the build system into a cpp file. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix build (sorry). Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/page/Navigator.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.cpp', 320 '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.cpp',
321 ], 321 ],
322 'conditions': [ 322 'conditions': [
323 ['OS=="win" and component=="shared_library"', { 323 ['OS=="win" and component=="shared_library"', {
324 'defines': [ 324 'defines': [
325 'USING_V8_SHARED', 325 'USING_V8_SHARED',
326 ], 326 ],
327 }], 327 }],
328 ['OS=="win"', { 328 ['OS=="win"', {
329 'defines': [ 329 'defines': [
330 'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
331 '__PRETTY_FUNCTION__=__FUNCTION__', 330 '__PRETTY_FUNCTION__=__FUNCTION__',
332 ], 331 ],
333 # In generated bindings code: 'switch contains default but no case'. 332 # In generated bindings code: 'switch contains default but no case'.
334 # Disable c4267 warnings until we fix size_t to int truncations. 333 # Disable c4267 warnings until we fix size_t to int truncations.
335 'msvs_disabled_warnings': [ 4065, 4267 ], 334 'msvs_disabled_warnings': [ 4065, 4267 ],
336 }], 335 }],
337 ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_def ines', { 336 ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_def ines', {
338 'cflags': [ 337 'cflags': [
339 '<!@(pkg-config --cflags-only-I ipp)', 338 '<!@(pkg-config --cflags-only-I ipp)',
340 ], 339 ],
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 '<(DEPTH)/third_party/ots/ots.gyp:ots', 389 '<(DEPTH)/third_party/ots/ots.gyp:ots',
391 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 390 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
392 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 391 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
393 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 392 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
394 '<(DEPTH)/url/url.gyp:url_lib', 393 '<(DEPTH)/url/url.gyp:url_lib',
395 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 394 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
396 '<(libjpeg_gyp_path):libjpeg', 395 '<(libjpeg_gyp_path):libjpeg',
397 ], 396 ],
398 'direct_dependent_settings': { 397 'direct_dependent_settings': {
399 'defines': [ 398 'defines': [
400 'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
401 'WEBKIT_IMPLEMENTATION=1', 399 'WEBKIT_IMPLEMENTATION=1',
402 'INSIDE_WEBKIT', 400 'INSIDE_WEBKIT',
403 ], 401 ],
404 'include_dirs': [ 402 'include_dirs': [
405 '<@(webcore_include_dirs)', 403 '<@(webcore_include_dirs)',
406 '<(DEPTH)/gpu', 404 '<(DEPTH)/gpu',
407 '<(DEPTH)/third_party/angle_dx11/include/GLSLANG', 405 '<(DEPTH)/third_party/angle_dx11/include/GLSLANG',
408 ], 406 ],
409 'msvs_disabled_warnings': [ 407 'msvs_disabled_warnings': [
410 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, 408 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 ], 447 ],
450 }], 448 }],
451 ['OS=="android"', { 449 ['OS=="android"', {
452 'sources/': [ 450 'sources/': [
453 ['exclude', 'accessibility/'], 451 ['exclude', 'accessibility/'],
454 ], 452 ],
455 }], 453 }],
456 ['OS=="mac"', { 454 ['OS=="mac"', {
457 'direct_dependent_settings': { 455 'direct_dependent_settings': {
458 'defines': [ 456 'defines': [
459 # Match Safari and Mozilla on Mac x86.
460 'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"',
461
462 # Chromium's version of WebCore includes the following Objective-C 457 # Chromium's version of WebCore includes the following Objective-C
463 # classes. The system-provided WebCore framework may also provide 458 # classes. The system-provided WebCore framework may also provide
464 # these classes. Because of the nature of Objective-C binding 459 # these classes. Because of the nature of Objective-C binding
465 # (dynamically at runtime), it's possible for the 460 # (dynamically at runtime), it's possible for the
466 # Chromium-provided versions to interfere with the system-provided 461 # Chromium-provided versions to interfere with the system-provided
467 # versions. This may happen when a system framework attempts to 462 # versions. This may happen when a system framework attempts to
468 # use core.framework, such as when converting an HTML-flavored 463 # use core.framework, such as when converting an HTML-flavored
469 # string to an NSAttributedString. The solution is to force 464 # string to an NSAttributedString. The solution is to force
470 # Objective-C class names that would conflict to use alternate 465 # Objective-C class names that would conflict to use alternate
471 # names. 466 # names.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 '<(class_whitelist_regex)', 500 '<(class_whitelist_regex)',
506 '<(category_whitelist_regex)', 501 '<(category_whitelist_regex)',
507 ], 502 ],
508 }, 503 },
509 ], 504 ],
510 }, 505 },
511 }], 506 }],
512 ['OS=="win"', { 507 ['OS=="win"', {
513 'direct_dependent_settings': { 508 'direct_dependent_settings': {
514 'defines': [ 509 'defines': [
515 # Match Safari and Mozilla on Windows.
516 'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
517 '__PRETTY_FUNCTION__=__FUNCTION__', 510 '__PRETTY_FUNCTION__=__FUNCTION__',
518 ], 511 ],
519 }, 512 },
520 }], 513 }],
521 ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_def ines', { 514 ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_def ines', {
522 'direct_dependent_settings': { 515 'direct_dependent_settings': {
523 'cflags': [ 516 'cflags': [
524 '<!@(pkg-config --cflags-only-I ipp)', 517 '<!@(pkg-config --cflags-only-I ipp)',
525 ], 518 ],
526 }, 519 },
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h', 1111 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h',
1119 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp', 1112 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp',
1120 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h', 1113 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h',
1121 ], 1114 ],
1122 'sources/': [ 1115 'sources/': [
1123 ['exclude', 'testing/js'], 1116 ['exclude', 'testing/js'],
1124 ], 1117 ],
1125 }, 1118 },
1126 ], # targets 1119 ], # targets
1127 } 1120 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/Navigator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698