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

Side by Side Diff: Source/platform/blink_platform.gyp

Issue 101693004: Move remaining core/platform/mac files to platform/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Retry fixing the compile problem Created 6 years, 11 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 | « Source/platform/Theme.h ('k') | Source/platform/blink_platform.gypi » ('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) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 # 87 #
88 # If this is unhandled, the console will receive log messages 88 # If this is unhandled, the console will receive log messages
89 # such as: 89 # such as:
90 # com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is implem ented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper.a pp/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Frame work and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCo re.framework/Versions/A/WebCore. One of the two will be used. Which one is undef ined. 90 # com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is implem ented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper.a pp/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Frame work and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCo re.framework/Versions/A/WebCore. One of the two will be used. Which one is undef ined.
91 'WebCascadeList=ChromiumWebCoreObjCWebCascadeList', 91 'WebCascadeList=ChromiumWebCoreObjCWebCascadeList',
92 'WebFontCache=ChromiumWebCoreObjCWebFontCache', 92 'WebFontCache=ChromiumWebCoreObjCWebFontCache',
93 'WebScrollAnimationHelperDelegate=ChromiumWebCoreObjCWebScrollAnimat ionHelperDelegate', 93 'WebScrollAnimationHelperDelegate=ChromiumWebCoreObjCWebScrollAnimat ionHelperDelegate',
94 'WebScrollbarPainterControllerDelegate=ChromiumWebCoreObjCWebScrollb arPainterControllerDelegate', 94 'WebScrollbarPainterControllerDelegate=ChromiumWebCoreObjCWebScrollb arPainterControllerDelegate',
95 'WebScrollbarPainterDelegate=ChromiumWebCoreObjCWebScrollbarPainterD elegate', 95 'WebScrollbarPainterDelegate=ChromiumWebCoreObjCWebScrollbarPainterD elegate',
96 'WebScrollbarPartAnimation=ChromiumWebCoreObjCWebScrollbarPartAnimat ion', 96 'WebScrollbarPartAnimation=ChromiumWebCoreObjCWebScrollbarPartAnimat ion',
97 'WebCoreFlippedView=ChromiumWebCoreObjCWebCoreFlippedView',
98 'WebCoreTextFieldCell=ChromiumWebCoreObjCWebCoreTextFieldCell',
99 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRe nderThemeNotificationObserver',
97 ], 100 ],
98 'postbuilds': [ 101 'postbuilds': [
99 { 102 {
100 # This step ensures that any Objective-C names that aren't 103 # This step ensures that any Objective-C names that aren't
101 # redefined to be "safe" above will cause a build failure. 104 # redefined to be "safe" above will cause a build failure.
102 'postbuild_name': 'Check Objective-C Rename', 105 'postbuild_name': 'Check Objective-C Rename',
103 'variables': { 106 'variables': {
104 'class_whitelist_regex': 107 'class_whitelist_regex':
105 'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView|Scroller StyleObserver', 108 'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView|Scroller StyleObserver',
106 'category_whitelist_regex': 109 'category_whitelist_regex':
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 ['include', 'audio/mac/FFTFrameMac\\.cpp$'], 252 ['include', 'audio/mac/FFTFrameMac\\.cpp$'],
250 ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'], 253 ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'],
251 ['include', 'fonts/mac/ComplexTextControllerCoreText\\.mm$'], 254 ['include', 'fonts/mac/ComplexTextControllerCoreText\\.mm$'],
252 ['include', 'mac/ColorMac\\.mm$'], 255 ['include', 'mac/ColorMac\\.mm$'],
253 ['include', 'mac/BlockExceptions\\.mm$'], 256 ['include', 'mac/BlockExceptions\\.mm$'],
254 ['include', 'mac/KillRingMac\\.mm$'], 257 ['include', 'mac/KillRingMac\\.mm$'],
255 ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'], 258 ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'],
256 ['include', 'mac/NSScrollerImpDetails\\.mm$'], 259 ['include', 'mac/NSScrollerImpDetails\\.mm$'],
257 ['include', 'mac/ScrollAnimatorMac\\.mm$'], 260 ['include', 'mac/ScrollAnimatorMac\\.mm$'],
258 ['include', 'mac/ScrollElasticityController\\.mm$'], 261 ['include', 'mac/ScrollElasticityController\\.mm$'],
262 ['include', 'mac/ThemeMac\\.h$'],
263 ['include', 'mac/ThemeMac\\.mm$'],
259 264
260 # Mac uses only ScrollAnimatorMac. 265 # Mac uses only ScrollAnimatorMac.
261 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'], 266 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'],
262 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'], 267 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'],
263 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'], 268 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
264 269
265 # The Mac currently uses FontCustomPlatformDataMac.cpp, 270 # The Mac currently uses FontCustomPlatformDataMac.cpp,
266 # included by regex above, instead. 271 # included by regex above, instead.
267 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'], 272 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
268 273
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ['OS=="android"', { 467 ['OS=="android"', {
463 'cflags!': ['-mthumb'], 468 'cflags!': ['-mthumb'],
464 }], 469 }],
465 ], 470 ],
466 },{ # target_arch!="arm" 471 },{ # target_arch!="arm"
467 'type': 'none', 472 'type': 'none',
468 }], 473 }],
469 ], 474 ],
470 }], 475 }],
471 } 476 }
OLDNEW
« no previous file with comments | « Source/platform/Theme.h ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698