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

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

Issue 12082066: Merge 140778 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 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
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 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/PickerCommon.h', 953 '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/PickerCommon.h',
954 '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/PickerCommon.cpp', 954 '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/PickerCommon.cpp',
955 '<@(_inputs)', 955 '<@(_inputs)',
956 ], 956 ],
957 }, 957 },
958 { 958 {
959 'action_name': 'CalendarPicker', 959 'action_name': 'CalendarPicker',
960 'inputs': [ 960 'inputs': [
961 '../Resources/pagepopups/calendarPicker.css', 961 '../Resources/pagepopups/calendarPicker.css',
962 '../Resources/pagepopups/calendarPicker.js', 962 '../Resources/pagepopups/calendarPicker.js',
963 '../Resources/pagepopups/chromium/calendarPickerChromium.css',
964 '../Resources/pagepopups/chromium/pickerCommonChromium.css',
963 '../Resources/pagepopups/suggestionPicker.css', 965 '../Resources/pagepopups/suggestionPicker.css',
964 '../Resources/pagepopups/suggestionPicker.js', 966 '../Resources/pagepopups/suggestionPicker.js',
965 ], 967 ],
966 'outputs': [ 968 'outputs': [
967 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.h', 969 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.h',
968 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.cpp', 970 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.cpp',
969 ], 971 ],
970 'action': [ 972 'action': [
971 'python', 973 'python',
972 '../make-file-arrays.py', 974 '../make-file-arrays.py',
973 '--condition=ENABLE(CALENDAR_PICKER)', 975 '--condition=ENABLE(CALENDAR_PICKER)',
974 '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.h', 976 '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.h',
975 '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.cpp', 977 '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPicker.cpp',
976 '<@(_inputs)', 978 '<@(_inputs)',
977 ], 979 ],
978 }, 980 },
979 { 981 {
980 'action_name': 'CalendarPickerMac',
981 'inputs': [
982 '../Resources/pagepopups/calendarPickerMac.css',
983 ],
984 'outputs': [
985 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.h',
986 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.cpp',
987 ],
988 'action': [
989 'python',
990 '../make-file-arrays.py',
991 '--condition=ENABLE(CALENDAR_PICKER)',
992 '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.h',
993 '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.cpp',
994 '<@(_inputs)',
995 ],
996 },
997 {
998 'action_name': 'ColorSuggestionPicker', 982 'action_name': 'ColorSuggestionPicker',
999 'inputs': [ 983 'inputs': [
1000 '../Resources/pagepopups/colorSuggestionPicker.css', 984 '../Resources/pagepopups/colorSuggestionPicker.css',
1001 '../Resources/pagepopups/colorSuggestionPicker.js', 985 '../Resources/pagepopups/colorSuggestionPicker.js',
1002 ], 986 ],
1003 'outputs': [ 987 'outputs': [
1004 '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.h', 988 '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.h',
1005 '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.cpp', 989 '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.cpp',
1006 ], 990 ],
1007 'action': [ 991 'action': [
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 ['enable_svg!=0', { 1307 ['enable_svg!=0', {
1324 'sources': [ 1308 'sources': [
1325 '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.cpp', 1309 '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.cpp',
1326 '<(SHARED_INTERMEDIATE_DIR)/webkit/V8SVGElementWrapperFactory.cpp', 1310 '<(SHARED_INTERMEDIATE_DIR)/webkit/V8SVGElementWrapperFactory.cpp',
1327 ], 1311 ],
1328 }], 1312 }],
1329 ['OS=="mac"', { 1313 ['OS=="mac"', {
1330 'include_dirs': [ 1314 'include_dirs': [
1331 '<(chromium_src_dir)/third_party/apple_webkit', 1315 '<(chromium_src_dir)/third_party/apple_webkit',
1332 ], 1316 ],
1333 'sources': [
1334 '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.cpp',
1335 ],
1336 }], 1317 }],
1337 ['OS=="win"', { 1318 ['OS=="win"', {
1338 'defines': [ 1319 'defines': [
1339 'WEBCORE_NAVIGATOR_PLATFORM="Win32"', 1320 'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
1340 '__PRETTY_FUNCTION__=__FUNCTION__', 1321 '__PRETTY_FUNCTION__=__FUNCTION__',
1341 ], 1322 ],
1342 # This is needed because Event.h in this directory is blocked 1323 # This is needed because Event.h in this directory is blocked
1343 # by a system header on windows. 1324 # by a system header on windows.
1344 'include_dirs++': ['../dom'], 1325 'include_dirs++': ['../dom'],
1345 'direct_dependent_settings': { 1326 'direct_dependent_settings': {
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
2262 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h', 2243 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',
2263 '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettings.cpp', 2244 '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettings.cpp',
2264 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettings.h', 2245 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettings.h',
2265 ], 2246 ],
2266 'sources/': [ 2247 'sources/': [
2267 ['exclude', 'testing/js'], 2248 ['exclude', 'testing/js'],
2268 ], 2249 ],
2269 }, 2250 },
2270 ], # targets 2251 ], # targets
2271 } 2252 }
OLDNEW
« no previous file with comments | « Source/WebCore/Resources/pagepopups/calendarPickerMac.css ('k') | Source/WebCore/rendering/RenderTheme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698