Changeset 177847 in webkit

Timestamp:

Jan 1, 2015 12:49:32 PM (9 years ago)

Author:

Antti Koivisto

Message:

Remove FontData::containsCharacters
​https://bugs.webkit.org/show_bug.cgi?id=140026

Reviewed by Dan Bernstein.

This virtual function has no clients.

• platform/graphics/FontData.h:
• platform/graphics/SegmentedFontData.cpp:

(WebCore::SegmentedFontData::containsCharacter): Deleted.
(WebCore::SegmentedFontData::containsCharacters): Deleted.

• platform/graphics/SegmentedFontData.h:
• platform/graphics/SimpleFontData.h:
• platform/graphics/freetype/SimpleFontDataFreeType.cpp:

(WebCore::SimpleFontData::containsCharacters): Deleted.

• platform/graphics/ios/SimpleFontDataIOS.mm:

(WebCore::SimpleFontData::containsCharacters): Deleted.

• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::containsCharacters): Deleted.

• platform/graphics/win/SimpleFontDataWin.cpp:

(WebCore::SimpleFontData::containsCharacters): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontData.h (modified) (1 diff)
• platform/graphics/SegmentedFontData.cpp (modified) (1 diff)
• platform/graphics/SegmentedFontData.h (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (1 diff)
• platform/graphics/freetype/SimpleFontDataFreeType.cpp (modified) (1 diff)
• platform/graphics/ios/SimpleFontDataIOS.mm (modified) (1 diff)
• platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)
• platform/graphics/win/SimpleFontDataWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-01  Antti Koivisto  <antti@apple.com>
+
+        Remove FontData::containsCharacters
+        https://bugs.webkit.org/show_bug.cgi?id=140026
+
+        Reviewed by Dan Bernstein.
+
+        This virtual function has no clients.
+
+        * platform/graphics/FontData.h:
+        * platform/graphics/SegmentedFontData.cpp:
+        (WebCore::SegmentedFontData::containsCharacter): Deleted.
+        (WebCore::SegmentedFontData::containsCharacters): Deleted.
+        * platform/graphics/SegmentedFontData.h:
+        * platform/graphics/SimpleFontData.h:
+        * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+        (WebCore::SimpleFontData::containsCharacters): Deleted.
+        * platform/graphics/ios/SimpleFontDataIOS.mm:
+        (WebCore::SimpleFontData::containsCharacters): Deleted.
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::containsCharacters): Deleted.
+        * platform/graphics/win/SimpleFontDataWin.cpp:
+        (WebCore::SimpleFontData::containsCharacters): Deleted.
+
 2015-01-01  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontData.h

@@ -49 +49 @@
 
     virtual const SimpleFontData* fontDataForCharacter(UChar32) const = 0;
-    virtual bool containsCharacters(const UChar*, int length) const = 0;
     virtual bool isCustomFont() const = 0;
     virtual bool isLoading() const = 0;

trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp

@@ -49 +49 @@
 }
 
-bool SegmentedFontData::containsCharacter(UChar32 c) const
-{
-    Vector<FontDataRange>::const_iterator end = m_ranges.end();
-    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
-        if (c >= it->from() && c <= it->to())
-            return true;
-    }
-    return false;
-}
-
-bool SegmentedFontData::containsCharacters(const UChar* characters, int length) const
-{
-    UChar32 c;
-    for (int i = 0; i < length; ) {
-        U16_NEXT(characters, i, length, c)
-        if (!containsCharacter(c))
-            return false;
-    }
-    return true;
-}
-
 bool SegmentedFontData::isCustomFont() const
 {

trunk/Source/WebCore/platform/graphics/SegmentedFontData.h

@@ -71 +71 @@
 
     virtual const SimpleFontData* fontDataForCharacter(UChar32) const;
-    virtual bool containsCharacters(const UChar*, int length) const;
 
     virtual bool isCustomFont() const;
     virtual bool isLoading() const;
     virtual bool isSegmented() const;
-
-    bool containsCharacter(UChar32) const;
 
     Vector<FontDataRange, 1> m_ranges;

trunk/Source/WebCore/platform/graphics/SimpleFontData.h

@@ -167 +167 @@
 
     virtual const SimpleFontData* fontDataForCharacter(UChar32) const override;
-    virtual bool containsCharacters(const UChar*, int length) const override;
 
     Glyph glyphForCharacter(UChar32) const;

trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp

@@ -117 +117 @@
 }
 
-bool SimpleFontData::containsCharacters(const UChar* characters, int bufferLength) const
-{
-    ASSERT(m_platformData.scaledFont());
-    FT_Face face = cairo_ft_scaled_font_lock_face(m_platformData.scaledFont());
-    if (!face)
-        return false;
-
-    UTF16UChar32Iterator iterator(characters, bufferLength);
-    UChar32 character = iterator.next();
-    while (character != iterator.end()) {
-        if (!FcFreeTypeCharIndex(face, character)) {
-            cairo_ft_scaled_font_unlock_face(m_platformData.scaledFont());
-            return false;
-        }
-        character = iterator.next();
-    }
-
-    cairo_ft_scaled_font_unlock_face(m_platformData.scaledFont());
-    return true;
-}
-
 void SimpleFontData::determinePitch()
 {

trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm

@@ -168 +168 @@
 }
 
-bool SimpleFontData::containsCharacters(const UChar*, int) const
-{
-    return false;
-}
-
 void SimpleFontData::determinePitch()
 {

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

@@ -322 +322 @@
     return 0;
 }
-#endif // !PLATFORM(IOS)
-
-#if !PLATFORM(IOS)
-bool SimpleFontData::containsCharacters(const UChar* characters, int length) const
-{
-    NSString *string = [[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(characters) length:length freeWhenDone:NO];
-    NSCharacterSet *set = [[m_platformData.nsFont() coveredCharacterSet] invertedSet];
-    bool result = set && [string rangeOfCharacterFromSet:set].location == NSNotFound;
-    [string release];
-    return result;
-}
 
 void SimpleFontData::determinePitch()

trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp

@@ -140 +140 @@
 }
 
-bool SimpleFontData::containsCharacters(const UChar* characters, int length) const
-{
-    // FIXME: Support custom fonts.
-    if (isCustomFont())
-        return false;
-
-    // FIXME: Microsoft documentation seems to imply that characters can be output using a given font and DC
-    // merely by testing code page intersection.  This seems suspect though.  Can't a font only partially
-    // cover a given code page?
-    IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
-    if (!langFontLink)
-        return false;
-
-    HWndDC dc(0);
-
-    DWORD acpCodePages;
-    if (FAILED(langFontLink->CodePageToCodePages(CP_ACP, &acpCodePages))) {
-        WTFLogAlways("SimpleFontData::containsCharacters: Unable to convert to CP_ACP code page.");
-        return false;
-    }
-
-    DWORD fontCodePages;
-    if (FAILED(langFontLink->GetFontCodePages(dc, m_platformData.hfont(), &fontCodePages))) {
-        WTFLogAlways("SimpleFontData::containsCharacters: Unable to find matching code page for specified font.");
-        return false;
-    }
-
-    DWORD actualCodePages = 0;
-    long numCharactersProcessed = 0;
-    long offset = 0;
-    while (offset < length) {
-        if (FAILED(langFontLink->GetStrCodePages(characters, length, acpCodePages, &actualCodePages, &numCharactersProcessed)))
-            return false;
-        if ((actualCodePages & fontCodePages) == 0)
-            return false;
-        offset += numCharactersProcessed;
-    }
-
-    return true;
-}
-
 void SimpleFontData::determinePitch()
 {