SkTypeface::MakeFromName to take SkFontStyle.

tests/TypefaceTest.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 "SkRefCnt.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
 #include "Test.h"
 
 DEF_TEST(Typeface, reporter) {
 
-    sk_sp<SkTypeface> t1(SkTypeface::MakeFromName(nullptr, SkTypeface::kNormal));
+    sk_sp<SkTypeface> t1(SkTypeface::MakeFromName(nullptr, SkFontStyle()));
     sk_sp<SkTypeface> t2(SkTypeface::MakeDefault(SkTypeface::kNormal));
 
     REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), t2.get()));
     REPORTER_ASSERT(reporter, SkTypeface::Equal(0, t1.get()));
     REPORTER_ASSERT(reporter, SkTypeface::Equal(0, t2.get()));
     REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), 0));
     REPORTER_ASSERT(reporter, SkTypeface::Equal(t2.get(), 0));
 
 #ifdef SK_BUILD_FOR_ANDROID
     sk_sp<SkTypeface> t3(SkTypeface::MakeFromName("non-existent-font", SkTypeface::kNormal));

[bungeman-skia, 2016/05/26 15:39:33]

Need to update this one as well. (The wonders of multi-platform development and
users. Some Android apps appear to currently depend on this returning nullptr,
even though the interface states that it will return the 'default font' and
never return nullptr.)

I pulled this patch down and updated this use. Android built, so I think this is
the last one.

[Mikus, 2016/05/30 14:18:39]

Done.

     REPORTER_ASSERT(reporter, nullptr == t3);
 #endif
 }
 
 namespace {
 
 class SkEmptyTypeface : public SkTypeface {
 public:
     static sk_sp<SkTypeface> Create(SkFontID id) { return sk_sp<SkTypeface>(new SkEmptyTypeface(id)); }
 protected:
@@ skipping 52 matching lines @@
             REPORTER_ASSERT(reporter, count(reporter, cache) == 2);
             cache.purgeAll();
             REPORTER_ASSERT(reporter, count(reporter, cache) == 2);
         }
         REPORTER_ASSERT(reporter, count(reporter, cache) == 2);
         cache.purgeAll();
         REPORTER_ASSERT(reporter, count(reporter, cache) == 1);
     }
     REPORTER_ASSERT(reporter, t1->unique());
 }