Remove 'legacy' font descriptor methods.

http://codereview.appspot.com/6261059/

git-svn-id: http://skia.googlecode.com/svn/trunk@4115 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/ports/SkFontDescriptor.h b/src/ports/SkFontDescriptor.h
index 6f97df1..b226029 100644 (file)
--- a/src/ports/SkFontDescriptor.h
+++ b/src/ports/SkFontDescriptor.h
@@ -34,12 +34,6 @@ public:
     void setPostscriptName(const char* name) { fPostscriptName.set(name); }
     void setFontFileName(const char* name) { fFontFileName.set(name); }
 
-    // legacy naming
-    SkTypeface::Style getFontStyle() { return this->getStyle(); }
-    void setFontStyle(SkTypeface::Style style) { this->setStyle(style); }
-    const char* getFontFamilyName() { return this->getFamilyName(); }
-    void setFontFamilyName(const char* name) { this->setFamilyName(name); }
-
 private:
     SkString fFamilyName;
     SkString fFullName;

diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index 74fc63d..4ae15c7 100644 (file)
--- a/src/ports/SkFontHost_linux.cpp
+++ b/src/ports/SkFontHost_linux.cpp
@@ -472,8 +472,8 @@ static void load_system_fonts() {
 void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {
 
     SkFontDescriptor descriptor;
-    descriptor.setFontFamilyName(find_family_name(face));
-    descriptor.setFontStyle(face->style());
+    descriptor.setFamilyName(find_family_name(face));
+    descriptor.setStyle(face->style());
     descriptor.setFontFileName(((FamilyTypeface*)face)->getUniqueString());
 
     descriptor.serialize(stream);
@@ -500,9 +500,9 @@ SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
     }
 
     SkFontDescriptor descriptor(stream);
-    const char* familyName = descriptor.getFontFamilyName();
+    const char* familyName = descriptor.getFamilyName();
     const char* typefaceName = descriptor.getFontFileName();
-    const SkTypeface::Style style = descriptor.getFontStyle();
+    const SkTypeface::Style style = descriptor.getStyle();
 
     const uint32_t customFontDataLength = stream->readPackedUInt();
     if (customFontDataLength > 0) {