sky/engine/platform/fonts/skia/FontCacheSkia.cpp - Issue 746023002: Make absolute and sort all Sky headers

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 746023002: Make absolute and sort all Sky headers (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sky/engine/platform/fonts/opentype/OpenTypeVerticalData.cpp ('k') | sky/engine/platform/fonts/skia/FontCustomPlatformDataSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3732748e8da77124a0d6ef95fb68fcf11cd1f263..75c3116b7ac26e1d030240575bf9c9e5484599e5 100644

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

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

@@ -28,26 +28,26 @@

* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#include "config.h"

+#include "sky/engine/config.h"

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

-#include "SkFontConfigInterface.h"

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

#endif

-#include "SkFontMgr.h"

-#include "SkStream.h"

-#include "SkTypeface.h"

-#include "platform/NotImplemented.h"

-#include "platform/fonts/AlternateFontFamily.h"

-#include "platform/fonts/FontCache.h"

-#include "platform/fonts/FontDescription.h"

-#include "platform/fonts/FontFaceCreationParams.h"

-#include "platform/fonts/SimpleFontData.h"

-#include "public/platform/Platform.h"

-#include "public/platform/linux/WebSandboxSupport.h"

-#include "wtf/Assertions.h"

-#include "wtf/text/AtomicString.h"

-#include "wtf/text/CString.h"

#include <unicode/locid.h>

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

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

+#include "sky/engine/platform/fonts/FontCache.h"

+#include "sky/engine/platform/fonts/FontDescription.h"

+#include "sky/engine/platform/fonts/FontFaceCreationParams.h"

+#include "sky/engine/platform/fonts/SimpleFontData.h"

+#include "sky/engine/public/platform/Platform.h"

+#include "sky/engine/public/platform/linux/WebSandboxSupport.h"

+#include "sky/engine/wtf/Assertions.h"

+#include "sky/engine/wtf/text/AtomicString.h"

+#include "sky/engine/wtf/text/CString.h"

+#include "third_party/skia/include/core/SkStream.h"

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

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

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

static SkStream* streamForFontconfigInterfaceId(int fontconfigInterfaceId)