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

Unified Diff: Source/core/core.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 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/core.gyp
diff --git a/Source/core/core.gyp b/Source/core/core.gyp
index 882565dec888f0cd6d608fa9c5ab1b353ab21327..9afa96088fab11b89b28bae0b999cca70a6ee114 100644
--- a/Source/core/core.gyp
+++ b/Source/core/core.gyp
@@ -450,52 +450,6 @@
['exclude', 'accessibility/'],
],
}],
- ['OS=="mac"', {
- 'direct_dependent_settings': {
- 'defines': [
- # Chromium's version of WebCore includes the following Objective-C
- # classes. The system-provided WebCore framework may also provide
- # these classes. Because of the nature of Objective-C binding
- # (dynamically at runtime), it's possible for the
- # Chromium-provided versions to interfere with the system-provided
- # versions. This may happen when a system framework attempts to
- # use core.framework, such as when converting an HTML-flavored
- # string to an NSAttributedString. The solution is to force
- # Objective-C class names that would conflict to use alternate
- # names.
- #
- # This list will hopefully shrink but may also grow. Its
- # performance is monitored by the "Check Objective-C Rename"
- # postbuild step, and any suspicious-looking symbols not handled
- # here or whitelisted in that step will cause a build failure.
- #
- # If this is unhandled, the console will receive log messages
- # such as:
- # com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is implemented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper.app/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Framework and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore. One of the two will be used. Which one is undefined.
- 'WebCoreFlippedView=ChromiumWebCoreObjCWebCoreFlippedView',
- 'WebCoreTextFieldCell=ChromiumWebCoreObjCWebCoreTextFieldCell',
- 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
- ],
- 'postbuilds': [
- {
- # This step ensures that any Objective-C names that aren't
- # redefined to be "safe" above will cause a build failure.
- 'postbuild_name': 'Check Objective-C Rename',
- 'variables': {
- 'class_whitelist_regex':
- 'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView|ScrollerStyleObserver',
- 'category_whitelist_regex':
- 'TCMInterposing|ScrollAnimatorChromiumMacExt|WebCoreTheme',
- },
- 'action': [
- '../build/scripts/check_objc_rename.sh',
- '<(class_whitelist_regex)',
- '<(category_whitelist_regex)',
- ],
- },
- ],
- },
- }],
['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
'direct_dependent_settings': {
'cflags': [
@@ -622,8 +576,6 @@
# Cherry-pick some files that can't be included by broader regexps.
# Some of these are used instead of Chromium platform files, see
# the specific exclusions in the "exclude" list below.
- ['include', 'platform/mac/ThemeMac\\.h$'],
- ['include', 'platform/mac/ThemeMac\\.mm$'],
['include', 'platform/mac/WebCoreSystemInterface\\.h$'],
['include', 'platform/mac/WebCoreTextRenderer\\.mm$'],
['include', 'platform/text/mac/ShapeArabic\\.c$'],
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698