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

Side by Side Diff: Source/platform/BUILD.gn

Issue 175253002: Switch to HarfBuzz on Mac and remove CoreText shaper (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fighting trunk TestExpectation changes Created 6 years, 2 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/build/features.gypi ('k') | Source/platform/blink_platform.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//third_party/WebKit/Source/build/scripts/scripts.gni") 6 import("//third_party/WebKit/Source/build/scripts/scripts.gni")
7 import("//third_party/WebKit/Source/config.gni") 7 import("//third_party/WebKit/Source/config.gni")
8 import("//third_party/WebKit/Source/platform/platform.gni") 8 import("//third_party/WebKit/Source/platform/platform.gni")
9 import("//third_party/WebKit/Source/platform/platform_generated.gni") 9 import("//third_party/WebKit/Source/platform/platform_generated.gni")
10 10
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 deps = [ 206 deps = [
207 ":make_platform_generated", 207 ":make_platform_generated",
208 "//third_party/harfbuzz-ng", 208 "//third_party/harfbuzz-ng",
209 "//third_party/icu", 209 "//third_party/icu",
210 "//third_party/WebKit/Source/wtf", 210 "//third_party/WebKit/Source/wtf",
211 "//third_party/WebKit/Source/platform/heap", 211 "//third_party/WebKit/Source/platform/heap",
212 ] 212 ]
213 213
214 if (is_mac) { 214 if (is_mac) {
215 sources -= [ 215 sources -= [
216 "fonts/harfbuzz/FontHarfBuzz.cpp",
217 "fonts/harfbuzz/HarfBuzzFaceSkia.cpp",
218 "fonts/opentype/OpenTypeTypes.h", 216 "fonts/opentype/OpenTypeTypes.h",
219 "fonts/opentype/OpenTypeVerticalData.cpp", 217 "fonts/opentype/OpenTypeVerticalData.cpp",
220 "fonts/opentype/OpenTypeVerticalData.h", 218 "fonts/opentype/OpenTypeVerticalData.h",
221 # The Mac currently uses FontCustomPlatformDataMac.cpp instead. 219 # The Mac currently uses FontCustomPlatformDataMac.cpp instead.
222 "fonts/skia/FontCustomPlatformDataSkia.cpp", 220 "fonts/skia/FontCustomPlatformDataSkia.cpp",
223 "fonts/skia/FontCacheSkia.cpp", 221 "fonts/skia/FontCacheSkia.cpp",
224 "fonts/skia/SimpleFontDataSkia.cpp",
225 # Uses LocaleMac instead. 222 # Uses LocaleMac instead.
226 "text/LocaleICU.cpp", 223 "text/LocaleICU.cpp",
227 "text/LocaleICU.h", 224 "text/LocaleICU.h",
228 # Uses KillRingMac.mm instead. 225 # Uses KillRingMac.mm instead.
229 "KillRingNone.cpp", 226 "KillRingNone.cpp",
230 # Mac uses only ScrollAnimatorMac. 227 # Mac uses only ScrollAnimatorMac.
231 "scroll/ScrollbarThemeNonMacCommon.cpp", 228 "scroll/ScrollbarThemeNonMacCommon.cpp",
232 "scroll/ScrollbarThemeNonMacCommon.h", 229 "scroll/ScrollbarThemeNonMacCommon.h",
233 "scroll/ScrollAnimatorNone.cpp", 230 "scroll/ScrollAnimatorNone.cpp",
234 "scroll/ScrollAnimatorNone.h", 231 "scroll/ScrollAnimatorNone.h",
235 ] 232 ]
236 233
237 # Some Mac-specific parts of WebKit won't compile without having this 234 # Some Mac-specific parts of WebKit won't compile without having this
238 # prefix header injected. 235 # prefix header injected.
239 cflags = [ 236 cflags = [
240 "-include", 237 "-include",
241 rebase_path("../build/mac/Prefix.h", root_build_dir), 238 rebase_path("../build/mac/Prefix.h", root_build_dir),
242 ] 239 ]
243 240
244 defines += [ "WebFontCache=ChromiumWebCoreObjCWebFontCache" ] 241 defines += [ "WebFontCache=ChromiumWebCoreObjCWebFontCache" ]
245 configs += [ ":mac_objc_renaming" ] 242 configs += [ ":mac_objc_renaming" ]
246 libs = [ 243 libs = [
247 "Accelerate.framework", 244 "Accelerate.framework",
248 "Carbon.framework", 245 "Carbon.framework",
249 "Foundation.framework", 246 "Foundation.framework",
250 ] 247 ]
251 } else { 248 } else {
252 sources -= [ 249 sources -= [
253 "fonts/harfbuzz/HarfBuzzFaceCoreText.cpp",
254 "geometry/cg/FloatPointCG.cpp", 250 "geometry/cg/FloatPointCG.cpp",
255 "geometry/cg/FloatRectCG.cpp", 251 "geometry/cg/FloatRectCG.cpp",
256 "geometry/cg/FloatSizeCG.cpp", 252 "geometry/cg/FloatSizeCG.cpp",
257 "geometry/cg/IntPointCG.cpp", 253 "geometry/cg/IntPointCG.cpp",
258 "geometry/cg/IntRectCG.cpp", 254 "geometry/cg/IntRectCG.cpp",
259 "geometry/cg/IntSizeCG.cpp", 255 "geometry/cg/IntSizeCG.cpp",
260 ] 256 ]
261 } 257 }
262 258
263 if (is_win) { 259 if (is_win) {
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 #'cflags': ['-marm'], 391 #'cflags': ['-marm'],
396 # 'conditions': [ 392 # 'conditions': [
397 # ['OS=="android"', { 393 # ['OS=="android"', {
398 # 'cflags!': ['-mthumb'], 394 # 'cflags!': ['-mthumb'],
399 # }], 395 # }],
400 # ], 396 # ],
401 397
402 deps = [ ":blink_common" ] 398 deps = [ ":blink_common" ]
403 } 399 }
404 } 400 }
OLDNEW
« no previous file with comments | « Source/build/features.gypi ('k') | Source/platform/blink_platform.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698