add portable and canonical font support for DM

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleApp.h"
 
 #include "OverView.h"
@@ skipping 1643 matching lines @@
         switch (str[i]) {
             case ':': str[i] = '-'; break;
             case '/': str[i] = '-'; break;
             case ' ': str[i] = '_'; break;
             default: break;
         }
     }
 }
 #endif
 
-namespace sk_tool_utils {
-    extern bool gEnablePortableTypeface;
-};
+DECLARE_bool(portableFonts);
 
 bool SampleWindow::onHandleChar(SkUnichar uni) {
     {
         SkView* view = curr_view(this);
         if (view) {
             SkEvent evt(gCharEvtName);
             evt.setFast32(uni);
             if (view->doQuery(&evt)) {
                 return true;
             }
@@ skipping 35 matching lines @@
             // Cannot call updateTitle() synchronously, because the toggleBBox event is still in
             // the queue.
             post_event_to_sink(SkNEW_ARGS(SkEvent, (gUpdateWindowTitleEvtName)), this);
             this->inval(NULL);
             break;
         case 'f':
             // only
             toggleFPS();
             break;
         case 'F':
-            sk_tool_utils::gEnablePortableTypeface ^= true;
+            FLAGS_portableFonts ^= true;
             this->inval(NULL);
             break;
         case 'g':
             fRequestGrabImage = true;
             this->inval(NULL);
             break;
         case 'G':
             gShowGMBounds = !gShowGMBounds;
             post_event_to_sink(GMSampleView::NewShowSizeEvt(gShowGMBounds),
                             curr_view(this));
@@ skipping 665 matching lines @@
     setenv("ANDROID_ROOT", "/android/device/data", 0);
 #endif
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }