Push subsetter code upstream

skia/config/SkUserConfig.h

 /*
  * Copyright (C) 2006 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 114 matching lines @@
 #endif
 
 /*  Define this to allow PDF scalars above 32k.  The PDF/A spec doesn't allow
     them, but modern PDF interpreters should handle them just fine.
  */
 //#define SK_ALLOW_LARGE_PDF_SCALARS
 
 /*  Define this to provide font subsetter for font subsetting when generating
     PDF documents.
  */
-#define SK_SFNTLY_SUBSETTER "third_party/sfntly/src/subsetter/font_subsetter.h"
+#define SK_SFNTLY_SUBSETTER \
+    "third_party/sfntly/cpp/src/sample/chromium/font_subsetter.h"
 
 /*  Define this to remove dimension checks on bitmaps. Not all blits will be
     correct yet, so this is mostly for debugging the implementation.
  */
 //#define SK_ALLOW_OVER_32K_BITMAPS
 
 
 /*  To write debug messages to a console, skia will call SkDebugf(...) following
     printf conventions (e.g. const char* format, ...). If you want to redirect
     this to something other than printf, define yours here
@@ skipping 86 matching lines @@
 #endif
 
 // The default crash macro writes to badbeef which can cause some strange
 // problems. Instead, pipe this through to the logging function as a fatal
 // assertion.
 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
 
 // ===== End Chrome-specific definitions =====
 
 #endif