| Index: Source/platform/blink_platform.gypi | 
| diff --git a/Source/platform/blink_platform.gypi b/Source/platform/blink_platform.gypi | 
| index 1e0f4c5bc767ac25be66a0428a2b0c3b5767de58..d5f5518d6e4dd0dffe83e05f32950d5e4a5b2964 100644 | 
| --- a/Source/platform/blink_platform.gypi | 
| +++ b/Source/platform/blink_platform.gypi | 
| @@ -392,7 +392,6 @@ | 
| 'fonts/TextBlob.h', | 
| 'fonts/VDMXParser.cpp', | 
| 'fonts/VDMXParser.h', | 
| -      'fonts/WidthCache.h', | 
| 'fonts/android/FontCacheAndroid.cpp', | 
| 'fonts/linux/FontCacheLinux.cpp', | 
| 'fonts/linux/FontPlatformDataLinux.cpp', | 
| @@ -405,10 +404,14 @@ | 
| 'fonts/opentype/OpenTypeTypes.h', | 
| 'fonts/opentype/OpenTypeVerticalData.cpp', | 
| 'fonts/opentype/OpenTypeVerticalData.h', | 
| +      'fonts/shaping/CachingWordShapeIterator.h', | 
| +      'fonts/shaping/CachingWordShaper.cpp', | 
| +      'fonts/shaping/CachingWordShaper.h', | 
| 'fonts/shaping/HarfBuzzFace.cpp', | 
| 'fonts/shaping/HarfBuzzFace.h', | 
| 'fonts/shaping/HarfBuzzShaper.cpp', | 
| 'fonts/shaping/HarfBuzzShaper.h', | 
| +      'fonts/shaping/ShapeCache.h', | 
| 'fonts/shaping/Shaper.cpp', | 
| 'fonts/shaping/Shaper.h', | 
| 'fonts/shaping/SimpleShaper.cpp', | 
| @@ -952,6 +955,7 @@ | 
| 'fonts/GlyphBufferTest.cpp', | 
| 'fonts/GlyphPageTreeNodeTest.cpp', | 
| 'fonts/android/FontCacheAndroidTest.cpp', | 
| +      'fonts/shaping/CachingWordShaperTest.cpp', | 
| 'fonts/shaping/HarfBuzzShaperTest.cpp', | 
| 'geometry/FloatBoxTest.cpp', | 
| 'geometry/FloatBoxTestHelpers.cpp', | 
|  |