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

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

Issue 68103014: Move some core/platform/graphics/mac files to geometry (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Export IntSize/IntPoint Created 7 years, 1 month 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/core/platform/graphics/mac/IntSizeMac.mm ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator', 79 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
80 ], 80 ],
81 'defines': [ 81 'defines': [
82 'BLINK_PLATFORM_IMPLEMENTATION=1', 82 'BLINK_PLATFORM_IMPLEMENTATION=1',
83 'INSIDE_BLINK', 83 'INSIDE_BLINK',
84 ], 84 ],
85 'include_dirs': [ 85 'include_dirs': [
86 '<(DEPTH)/third_party/angle_dx11/include', 86 '<(DEPTH)/third_party/angle_dx11/include',
87 '<(SHARED_INTERMEDIATE_DIR)/blink', 87 '<(SHARED_INTERMEDIATE_DIR)/blink',
88 ], 88 ],
89 'xcode_settings': {
90 # Some Mac-specific parts of WebKit won't compile without having this
91 # prefix header injected.
92 # FIXME: make this a first-class setting.
93 'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h',
94 },
89 'sources': [ 95 'sources': [
90 '<@(platform_files)', 96 '<@(platform_files)',
91 97
92 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions. 98 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions.
93 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp', 99 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
94 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp', 100 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp',
95 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h', 101 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h',
96 '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp', 102 '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
97 ], 103 ],
98 # Disable c4267 warnings until we fix size_t to int truncations. 104 # Disable c4267 warnings until we fix size_t to int truncations.
99 # Disable c4724 warnings which is generated in VS2012 due to improper 105 # Disable c4724 warnings which is generated in VS2012 due to improper
100 # compiler optimizations, see crbug.com/237063 106 # compiler optimizations, see crbug.com/237063
101 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 107 'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
102 'conditions': [ 108 'conditions': [
103 ['OS=="mac"', { 109 ['OS=="mac"', {
104 'link_settings': { 110 'link_settings': {
105 'libraries': [ 111 'libraries': [
106 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 112 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
107 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 113 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
108 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 114 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
109 ] 115 ]
110 }, 116 },
111 'sources/': [ 117 'sources/': [
112 # We use LocaleMac.mm instead of LocaleICU.cpp 118 # We use LocaleMac.mm instead of LocaleICU.cpp
113 ['exclude', 'LocaleICU\\.(cpp|h)$'], 119 ['exclude', 'LocaleICU\\.(cpp|h)$'],
114 120
115 # The Mac uses mac/KillRingMac.mm instead of the dummy 121 # The Mac uses mac/KillRingMac.mm instead of the dummy
116 # implementation. 122 # implementation.
117 ['exclude', 'KillRingNone\\.cpp$'], 123 ['exclude', 'KillRingNone\\.cpp$'],
124
125 ['include', 'geometry/mac/FloatPointMac\\.mm$'],
126 ['include', 'geometry/mac/FloatRectMac\\.mm$'],
127 ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
128 ['include', 'geometry/mac/IntPointMac\\.mm$'],
129 ['include', 'geometry/mac/IntRectMac\\.mm$'],
130
131 ['include', 'geometry/cg/FloatPointCG\\.cpp$'],
132 ['include', 'geometry/cg/FloatRectCG\\.cpp$'],
133 ['include', 'geometry/cg/FloatSizeCG\\.cpp$'],
134 ['include', 'geometry/cg/IntPointCG\\.cpp$'],
135 ['include', 'geometry/cg/IntRectCG\\.cpp$'],
136 ['include', 'geometry/cg/IntSizeCG\\.cpp$'],
137
118 ], 138 ],
119 'defines': [ 139 'defines': [
120 'WebFontCache=ChromiumWebCoreObjCWebFontCache', 140 'WebFontCache=ChromiumWebCoreObjCWebFontCache',
121 ], 141 ],
122 }, { # OS!="mac" 142 }, { # OS!="mac"
123 'sources/': [ 143 'sources/': [
124 ['exclude', 'mac/'], 144 ['exclude', 'mac/'],
145 ['exclude', 'geometry/mac/'],
146 ['exclude', 'geometry/cg/'],
125 ], 147 ],
126 }], 148 }],
127 ['OS=="win"', { 149 ['OS=="win"', {
128 'sources/': [ 150 'sources/': [
129 # We use LocaleWin.cpp instead of LocaleICU.cpp 151 # We use LocaleWin.cpp instead of LocaleICU.cpp
130 ['exclude', 'LocaleICU\\.(cpp|h)$'], 152 ['exclude', 'LocaleICU\\.(cpp|h)$'],
131 ], 153 ],
132 }, { # OS!="win" 154 }, { # OS!="win"
133 'sources/': [ 155 'sources/': [
134 ['exclude', 'win/'], 156 ['exclude', 'win/'],
(...skipping 12 matching lines...) Expand all
147 'include_dirs': [ 169 'include_dirs': [
148 '<(DEPTH)/third_party/openmax_dl', 170 '<(DEPTH)/third_party/openmax_dl',
149 ], 171 ],
150 'dependencies': [ 172 'dependencies': [
151 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl', 173 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',
152 ], 174 ],
153 }], 175 }],
154 ], 176 ],
155 }], 177 }],
156 } 178 }
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/mac/IntSizeMac.mm ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698