Changeset 100886 in webkit


Ignore:
Timestamp:
Nov 20, 2011 10:10:24 PM (12 years ago)
Author:
bashi@chromium.org
Message:

[Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
​https://bugs.webkit.org/show_bug.cgi?id=72844

Source/WebCore:

Respects bold and italic properties that is given by fontconfig.

Reviewed by Darin Fisher.

  • platform/graphics/chromium/FontCacheLinux.cpp:

(WebCore::FontCache::getFontDataForCharacters): Removed #if and old logic.

Source/WebKit/chromium:

Removes old APIs for getting font family for given characters.

Reviewed by Darin Fisher.

  • public/linux/WebFontInfo.h: Removed old familyForChars().
  • public/linux/WebSandboxSupport.h: Removed old getFontFamilyForCharacters() and changed new getFontFamilyForCharacters() to be a pure virtual function.
  • src/linux/WebFontInfo.cpp: Removes old familyForChars().

LayoutTests:

Font selection mechanism of Chromium Linux port has been improved. Rebaselines affected tests.

Reviewed by Darin Fisher.

  • platform/chromium-linux/fast/text/cg-fallback-bolding-expected.png:
  • platform/chromium-linux/fast/text/cg-fallback-bolding-expected.txt:
  • platform/chromium-linux/fast/text/international/khmer-selection-expected.png:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r100885 r100886  
     12011-11-20  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        [Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
     4        https://bugs.webkit.org/show_bug.cgi?id=72844
     5
     6        Font selection mechanism of Chromium Linux port has been improved. Rebaselines affected tests.
     7
     8        Reviewed by Darin Fisher.
     9
     10        * platform/chromium-linux/fast/text/cg-fallback-bolding-expected.png:
     11        * platform/chromium-linux/fast/text/cg-fallback-bolding-expected.txt:
     12        * platform/chromium-linux/fast/text/international/khmer-selection-expected.png:
     13
    1142011-11-20  Ben Wells  <benwells@chromium.org>
    215

  • trunk/LayoutTests/platform/chromium-linux/fast/text/cg-fallback-bolding-expected.txt

    r56277 r100886  
    1414          text run at (0,60) width 109: "first font in the list."
    1515      RenderBlock {P} at (0,208) size 784x128
    16         RenderText {#text} at (0,0) size 75x128
    17           text run at (0,0) width 75 RTL: "\x{5D0}"
     16        RenderText {#text} at (0,0) size 72x128
     17          text run at (0,0) width 72 RTL: "\x{5D0}"

  • trunk/Source/WebCore/ChangeLog

    r100884 r100886  
     12011-11-20  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        [Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
     4        https://bugs.webkit.org/show_bug.cgi?id=72844
     5
     6        Respects bold and italic properties that is given by fontconfig.
     7
     8        Reviewed by Darin Fisher.
     9
     10        * platform/graphics/chromium/FontCacheLinux.cpp:
     11        (WebCore::FontCache::getFontDataForCharacters): Removed #if and old logic.
     12
    1132011-11-20  Noel Gordon  <noel.gordon@gmail.com>
    214

  • trunk/Source/WebCore/platform/graphics/chromium/FontCacheLinux.cpp

    r100601 r100886  
    6666
    6767    AtomicString atomicFamily(family.name);
    68     // FIXME: Remove this #if after API transition complete.
    69 #if 0
    7068    // Changes weight and/or italic of given FontDescription depends on
    7169    // the result of fontconfig so that keeping the correct font mapping
    … …  
    9189    platformData.setFakeItalic(shouldSetFakeItalic);
    9290    return getCachedFontData(&platformData, DoNotRetain);
    93 #else
    94     return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, DoNotRetain), DoNotRetain);
    95 #endif
    9691}
    9792

  • trunk/Source/WebKit/chromium/ChangeLog

    r100874 r100886  
     12011-11-20  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        [Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
     4        https://bugs.webkit.org/show_bug.cgi?id=72844
     5
     6        Removes old APIs for getting font family for given characters.
     7
     8        Reviewed by Darin Fisher.
     9
     10        * public/linux/WebFontInfo.h: Removed old familyForChars().
     11        * public/linux/WebSandboxSupport.h: Removed old getFontFamilyForCharacters() and changed new getFontFamilyForCharacters() to be a pure virtual function.
     12        * src/linux/WebFontInfo.cpp: Removes old familyForChars().
     13
    1142011-10-17  Antonio Gomes  <agomes@rim.com>
    215

  • trunk/Source/WebKit/chromium/public/linux/WebFontInfo.h

    r100601 r100886  
    5252    // Returns: the font family or an empty string if the request could not be
    5353    // satisfied.
    54     // FIXME: Depreciated API. Remove later.
    55     WEBKIT_EXPORT static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale);
    5654    // Returns: the font family instance. The instance has an empty font name if the request could not be satisfied.
    5755    WEBKIT_EXPORT static void familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily*);

  • trunk/Source/WebKit/chromium/public/linux/WebSandboxSupport.h

    r100601 r100886  
    5454    // Returns a string with the font family on an empty string if the
    5555    // request cannot be satisfied.
    56     // FIXME: Depreciated API. Remove later.
    57     virtual WebString getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters, const char* preferredLocale) { return WebString(); }
    5856    // Returns a WebFontFamily instance with the font name. The instance has empty font name if the request cannot be satisfied.
    5957    // FIXME: Make this to be a pure virtual function after transition.
    60     virtual void getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily* family)
    61     {
    62         family->name = getFontFamilyForCharacters(characters, numCharacters, preferredLocale).utf8();
    63     }
     58    virtual void getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily*) = 0;
    6459
    6560    virtual void getRenderStyleForStrike(const char* family, int sizeAndStyle, WebFontRenderStyle* style) = 0;

  • trunk/Source/WebKit/chromium/src/linux/WebFontInfo.cpp

    r100601 r100886  
    4141namespace WebKit {
    4242
    43 // FIXME: Depreciated API. Remove later.
    44 WebCString WebFontInfo::familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale)
    45 {
    46     WebFontFamily family;
    47     familyForChars(characters, numCharacters, preferredLocale, &family);
    48     return family.name;
    49 }
    50 
    5143void WebFontInfo::familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily* family)
    5244{
Note: See TracChangeset for help on using the changeset viewer.