sky/engine/platform/fonts/skia/FontCacheSkia.cpp - Issue 1205793002: Remove config.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sky/engine/platform/fonts/skia/FontCacheSkia.cpp

Issue 1205793002: Remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sky/engine/platform/fonts/skia/FontCacheSkia.cpp

diff --git a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp

index e94dcfc1c1575508417dc69ca598c803529d29c5..bb114e2113df55b6006b61cea1a517e68441db9b 100644

--- a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp

+++ b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp

@@ -30,9 +30,6 @@

#include "sky/engine/config.h"

-#if !OS(WIN) && !OS(ANDROID)

-#include "third_party/skia/include/ports/SkFontConfigInterface.h"

-#endif

#include <unicode/locid.h>

#include "sky/engine/platform/NotImplemented.h"

#include "sky/engine/platform/fonts/AlternateFontFamily.h"

@@ -49,6 +46,10 @@

#include "third_party/skia/include/core/SkTypeface.h"

#include "third_party/skia/include/ports/SkFontMgr.h"

+#if !OS(WIN) && !OS(ANDROID)

+#include "third_party/skia/include/ports/SkFontConfigInterface.h"

+#endif

#if !OS(WIN) && !OS(ANDROID) && !OS(IOS)

// TODO(bungeman) remove this temporary code ASAP.

// This namespace exists to ease transition of SkTypeface from using SkStream to SkStreamAsset.