Add a flag indicating locally-created fonts to SkCreateTypefaceFromCTFont

tests/SerializationTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkMallocPixelRef.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkTableColorFilter.h"
 #include "SkTemplates.h"
 #include "SkTypeface.h"
 #include "SkWriteBuffer.h"
 #include "SkValidatingReadBuffer.h"
 #include "SkXfermodeImageFilter.h"
+#ifdef SK_BUILD_FOR_MAC
+#include "SkTypeface_mac.h"
+#endif
 #include "Test.h"
 
 static const uint32_t kArraySize = 64;
 static const int kBitmapSize = 256;
 
 template<typename T>
 static void TestAlignment(T* testObj, skiatest::Reporter* reporter) {
     // Test memory read/write functions directly
     unsigned char dataWritten[1024];
     size_t bytesWrittenToMemory = testObj->writeToMemory(dataWritten);
@@ skipping 279 matching lines @@
     int pixelErrors = 0;
     for (int y = 0; y < b2.height(); ++y) {
         for (int x = 0; x < b2.width(); ++x) {
             if (b1.getColor(x, y) != b2.getColor(x, y))
                 ++pixelErrors;
         }
     }
     REPORTER_ASSERT(reporter, 0 == pixelErrors);
 }
 
-static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) {
-    // Load typeface form file.
-    // This test cannot run if there is no resource path.
-    SkString resourcePath = GetResourcePath();
-    if (resourcePath.isEmpty()) {
-        SkDebugf("Could not run fontstream test because resourcePath not specified.");
-        return;
-    }
-    SkString filename = SkOSPath::Join(resourcePath.c_str(), "test.ttc");
-    SkTypeface* typeface = SkTypeface::CreateFromFile(filename.c_str(), 1);
-    if (!typeface) {
-        SkDebugf("Could not run fontstream test because test.ttc not found.");
-        return;
-    }
-
+static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter, SkTypeface* typeface) {
     // Create a paint with the typeface we loaded.
     SkPaint paint;
     paint.setColor(SK_ColorGRAY);
     paint.setTextSize(SkIntToScalar(30));
     SkSafeUnref(paint.setTypeface(typeface));
 
     // Paint some text.
     SkPictureRecorder recorder;
     SkIRect canvasRect = SkIRect::MakeWH(kBitmapSize, kBitmapSize);
     SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(canvasRect.width()), 
@@ skipping 176 matching lines @@
         SkAutoTMalloc<unsigned char> data(size);
         writer.writeToMemory(static_cast<void*>(data.get()));
 
         // Deserialize picture
         SkValidatingReadBuffer reader(static_cast<void*>(data.get()), size);
         SkAutoTUnref<SkPicture> readPict(
             SkPicture::CreateFromBuffer(reader));
         REPORTER_ASSERT(reporter, readPict.get());
     }
 
-    TestPictureTypefaceSerialization(reporter);
+    {
+        // Load typeface form file.
+        // This test cannot run if there is no resource path.
+        SkString resourcePath = GetResourcePath();
+        if (resourcePath.isEmpty()) {
+            SkDebugf("Could not run fontstream test because resourcePath not specified.");
+            return;
+        }
+        SkString filename = SkOSPath::Join(resourcePath.c_str(), "test.ttc");
+        SkTypeface* typeface = SkTypeface::CreateFromFile(filename.c_str(), 1);
+        if (!typeface) {
+            SkDebugf("Could not run fontstream test because test.ttc not found.");
+            return;
+        }
+
+        TestPictureTypefaceSerialization(reporter, typeface);
+
+#ifdef SK_BUILD_FOR_MAC
+        // Now do almost the same but use SkCreateTypefaceFromCTFont
+        CGDataProviderRef provider = CGDataProviderCreateWithFilename(filename.c_str());
+        CGFontRef cgFont = CGFontCreateWithDataProvider(provider);
+        if (NULL == cgFont) {
+            SkDebugf("Could not run fontstream test, CGFontCreateWithDataProvider failed.");
+            return;
+        }
+        CTFontRef ctFont = CTFontCreateWithGraphicsFont(cgFont, 0, NULL, NULL);
+        typeface = SkCreateTypefaceFromCTFont(ctFont);
+        TestPictureTypefaceSerialization(reporter, typeface);
+        CFRelease(cgFont);
+        CFRelease(provider);
+#endif  // SK_BUILD_FOR_MAC
+    }
 }