Removing unneeded code from SimpleFontData.

third_party/WebKit/WebCore/platform/graphics/SimpleFontData.h

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 34 matching lines @@
 #include <QFont>
 #endif
 
 namespace WebCore {
 
 class FontDescription;
 class FontPlatformData;
 class SharedBuffer;
 class SVGFontData;
 class WidthMap;
-class ZeroWidthFontData;
-class CJKWidthFontData;
 
 enum Pitch { UnknownPitch, FixedPitch, VariablePitch };
 
 class SimpleFontData : public FontData {
 public:
     SimpleFontData(const FontPlatformData&, bool customFont = false, bool loading = false, SVGFontData* data = 0);
     virtual ~SimpleFontData();
 
-protected:
-    // sub-class constructor
-    SimpleFontData();
-
 public:
     const FontPlatformData& platformData() const { return m_font; }
     SimpleFontData* smallCapsFontData(const FontDescription& fontDescription) const;
 
     // vertical metrics
     int ascent() const { return m_ascent; }
     int descent() const { return m_descent; }
     int lineSpacing() const { return m_lineSpacing; }
     int lineGap() const { return m_lineGap; }
     int maxCharWidth() const { return m_maxCharWidth; }
     int avgCharWidth() const { return m_avgCharWidth; }
 
     float xHeight() const { return m_xHeight; }
     unsigned unitsPerEm() const { return m_unitsPerEm; }
 
-    virtual float widthForGlyph(Glyph) const;
+    float widthForGlyph(Glyph) const;
     float platformWidthForGlyph(Glyph) const;
 
     virtual const SimpleFontData* fontDataForCharacter(UChar32) const;
     virtual bool containsCharacters(const UChar*, int length) const;
 
     void determinePitch();
     Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }
 
-    static bool isCJKCodePoint(UChar32 c);
-
 #if ENABLE(SVG_FONTS)
     SVGFontData* svgFontData() const { return m_svgFontData.get(); }
     bool isSVGFont() const { return m_svgFontData; }
 #else
     bool isSVGFont() const { return false; }
 #endif
 
     virtual bool isCustomFont() const { return m_isCustomFont; }
     virtual bool isLoading() const { return m_isLoading; }
     virtual bool isSegmented() const;
@@ skipping 33 matching lines @@
 #endif
 
 #if PLATFORM(GTK) && PLATFORM(CAIRO)
     void setFont(cairo_t*) const;
 #endif
 
 #if PLATFORM(WX)
     wxFont getWxFont() const { return m_font.font(); }
 #endif
 
-    const SimpleFontData* zeroWidthFontData() const;
-    const SimpleFontData* cjkWidthFontData() const;
-
 private:
     void platformInit();
     void platformGlyphInit();
     void platformDestroy();
     
     void commonInit();
 
 #if PLATFORM(WIN)
     void initGDIFont();
     void platformCommonDestroy();
@@ skipping 52 matching lines @@
 #if USE(CORE_TEXT)
     mutable RetainPtr<CTFontRef> m_CTFont;
     mutable RetainPtr<CFDictionaryRef> m_CFStringAttributes;
 #endif
 
 #if PLATFORM(WIN)
     bool m_isSystemFont;
     mutable SCRIPT_CACHE m_scriptCache;
     mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties;
 #endif
-
-private:
-    OwnPtr<ZeroWidthFontData> m_zeroWidthFontData;
-    OwnPtr<CJKWidthFontData> m_cjkWidthFontData;
-};
-
-// SimpleFontData sub-classes:
-
-// Has a single zero-width glyph, used for ZWS and 
-// UCHAR_DEFAULT_IGNORABLE_CODE_POINT characters
-class ZeroWidthFontData : public SimpleFontData {
-public:
-    void init(SimpleFontData*);
-    virtual float widthForGlyph(Glyph) const { return 0.0f; }
-};
-
-// Monospaced, single glyph and width, used for CJK characters
-// The assumption made here can break for some high-quality CJK fonts with
-// proportional CJK glyphs.
-class CJKWidthFontData : public ZeroWidthFontData {
-public:
-    CJKWidthFontData();
-
-    virtual float widthForGlyph(Glyph) const;
-
-private:
-    // Optimization for CJK glyphs
-    mutable float m_cjkGlyphWidth;
 };
 
 } // namespace WebCore
 
 #endif // SimpleFontData_h