add portable and canonical font support for DM

samplecode/SampleApp.cpp

Index: samplecode/SampleApp.cpp
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 27365e0b879307aa50cc70d660ea2126caf4992b..e429c34863722a3d7449e84321a7d474639d3622 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -1661,9 +1661,7 @@ static void cleanup_for_filename(SkString* name) {
 }
 #endif
 
-namespace sk_tool_utils {
-    extern bool gEnablePortableTypeface;
-};
+DECLARE_bool(portableFonts);
 
 bool SampleWindow::onHandleChar(SkUnichar uni) {
     {
@@ -1719,7 +1717,7 @@ bool SampleWindow::onHandleChar(SkUnichar uni) {
             toggleFPS();
             break;
         case 'F':
-            sk_tool_utils::gEnablePortableTypeface ^= true;
+            FLAGS_portableFonts ^= true;
             this->inval(NULL);
             break;
         case 'g':