Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2053)

Unified Diff: content/common/font_config_ipc_linux.h

Issue 870133002: Move to SkStreamAsset for SkTypeface streams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Covariance requires proof. Created 5 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/common/font_config_ipc_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/font_config_ipc_linux.h
diff --git a/content/common/font_config_ipc_linux.h b/content/common/font_config_ipc_linux.h
index c5cf80f72744dac30632e84bd43563e9fa94472d..17082867986949f13ddf03f1d297ca5475f8694b 100644
--- a/content/common/font_config_ipc_linux.h
+++ b/content/common/font_config_ipc_linux.h
@@ -6,10 +6,14 @@
#define CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_
#include "base/compiler_specific.h"
+#include "third_party/skia/include/core/SkStream.h"
+#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/ports/SkFontConfigInterface.h"
#include <string>
+class SkString;
+
namespace content {
// FontConfig implementation for Skia that proxies out of process to get out
@@ -25,7 +29,7 @@ class FontConfigIPC : public SkFontConfigInterface {
SkString* outFamilyName,
SkTypeface::Style* outStyle) override;
- SkStream* openStream(const FontIdentity&) override;
+ SkStreamAsset* openStream(const FontIdentity&) override;
enum Method {
METHOD_MATCH = 0,
« no previous file with comments | « no previous file | content/common/font_config_ipc_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698