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

Unified Diff: src/core/SkFontDescriptor.h

Issue 1057413005: Remove filename from SkFontDescriptor. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add file name to assert. Created 5 years, 8 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 | « include/core/SkPicture.h ('k') | src/core/SkFontDescriptor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkFontDescriptor.h
diff --git a/src/core/SkFontDescriptor.h b/src/core/SkFontDescriptor.h
index 13f9cb7257d8abdc023685face5dac6f4ed0004d..66707ddd3c5e10819ecd87e4d2352ed603c85817 100644
--- a/src/core/SkFontDescriptor.h
+++ b/src/core/SkFontDescriptor.h
@@ -26,7 +26,6 @@ public:
const char* getFamilyName() const { return fFamilyName.c_str(); }
const char* getFullName() const { return fFullName.c_str(); }
const char* getPostscriptName() const { return fPostscriptName.c_str(); }
- const char* getFontFileName() const { return fFontFileName.c_str(); }
bool hasFontData() const { return fFontData.get() != NULL; }
// Transfers ownership to the caller.
SkStreamAsset* transferFontData() { return fFontData.detach(); }
@@ -35,7 +34,6 @@ public:
void setFamilyName(const char* name) { fFamilyName.set(name); }
void setFullName(const char* name) { fFullName.set(name); }
void setPostscriptName(const char* name) { fPostscriptName.set(name); }
- void setFontFileName(const char* name) { fFontFileName.set(name); }
/** Set the font data only if it is necessary for serialization.
* This method takes ownership of the stream (both reference and cursor).
*/
@@ -46,7 +44,6 @@ private:
SkString fFamilyName;
SkString fFullName;
SkString fPostscriptName;
- SkString fFontFileName;
SkAutoTDelete<SkStreamAsset> fFontData;
int fFontIndex;
« no previous file with comments | « include/core/SkPicture.h ('k') | src/core/SkFontDescriptor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698