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

Unified Diff: Source/platform/blink_platform.gyp

Issue 622033002: Merge FontHarfBuzz.cpp into Font.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 | « no previous file | 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 48e15018840e2ae348281e4d4dd23b2d27c57176..97637f9c5a9f2ba3349af3a2ed890e3a264f3335 100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -251,7 +251,6 @@
['OS=="linux" or OS=="android" or OS=="win"', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
- ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'],
['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
@@ -337,7 +336,6 @@
['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
# Mac uses Harfbuzz.
- ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'],
['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
« no previous file with comments | « no previous file | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698