From 6e92a5e34dd2a55539799bfdfd0dd6d661c4d7da Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 19 Jul 2016 11:02:53 -0700 Subject: [PATCH] Remove unused code in FontCacheSkia (#2805) --- .../platform/fonts/skia/FontCacheSkia.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp index 246d96de6..52067a641 100644 --- a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp +++ b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp @@ -49,24 +49,6 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #endif -#if !OS(WIN) && !OS(ANDROID) && !OS(IOS) && !OS(MACOSX) -// TODO(bungeman) remove this temporary code ASAP. -// This namespace exists to ease transition of SkTypeface from using SkStream to SkStreamAsset. -namespace tmp { -// Like std::declval but only returns lvalue references, ok since it isn't used on rvalue references. -template T& declvall(); -// The return type of SkFontConfigInterface::openStream(const SkFontConfigInterface::FontIdentity&). -using StreamType = decltype(tmp::declvall().openStream(tmp::declvall())); -} -static tmp::StreamType streamForFontconfigInterfaceId(int fontconfigInterfaceId) -{ - SkAutoTUnref fci(SkFontConfigInterface::RefGlobal()); - SkFontConfigInterface::FontIdentity fontIdentity; - fontIdentity.fID = fontconfigInterfaceId; - return fci->openStream(fontIdentity); -} -#endif - namespace blink { static int toSkiaWeight(FontWeight weight) -- GitLab