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

Unified Diff: Source/platform/blink_platform.gyp

Issue 619923003: Remove HarfBuzzFaceCoreText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased on top of eae's gyp 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/blink_platform.gyp
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp
index 97637f9c5a9f2ba3349af3a2ed890e3a264f3335..8f56adef5adf674aa7ec3710ac2bca0acb90d8f7 100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -235,7 +235,7 @@
'sources/': [
# Exclude all platform specific things, reinclude them below on a per-platform basis
# FIXME: Figure out how to store these patterns in a variable.
- ['exclude', '(cf|cg|harfbuzz|mac|opentype|win)/'],
+ ['exclude', '(cf|cg|mac|opentype|win)/'],
['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'],
# *NEON.cpp files need special compile options.
@@ -251,9 +251,6 @@
['OS=="linux" or OS=="android" or OS=="win"', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
- ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
- ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'],
- ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
@@ -261,11 +258,8 @@
'dependencies': [
'<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
],
- }, { # OS!="linux" and OS!="android" and OS!="win"
- 'sources/': [
- ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
- ],
- }],
+ },
+ ],
['OS=="linux" or OS=="android"', {
'sources/': [
['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
@@ -335,11 +329,6 @@
['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
- # Mac uses Harfbuzz.
- ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'],
- ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
- ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
-
['include', 'geometry/mac/FloatPointMac\\.mm$'],
['include', 'geometry/mac/FloatRectMac\\.mm$'],
['include', 'geometry/mac/FloatSizeMac\\.mm$'],
@@ -362,8 +351,6 @@
['exclude', 'geometry/mac/'],
['exclude', 'geometry/cg/'],
['exclude', 'scroll/ScrollbarThemeMac'],
-
- ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
],
}],
['OS != "linux" and OS != "mac" and OS != "win"', {
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698