Commit 615df753 authored by bashi@chromium.org's avatar bashi@chromium.org

[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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a5c095f9
2011-11-20 Kenichi Ishibashi <bashi@chromium.org>
[Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
https://bugs.webkit.org/show_bug.cgi?id=72844
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:
2011-11-20 Ben Wells <benwells@chromium.org>
Rebaseline for border change in r100528
......@@ -13,5 +13,5 @@ layer at (0,0) size 800x600
text run at (35,40) width 749: "This test is making sure we don't make incorrect assumptions based off the fact that we would have to synthesize bold for the"
text run at (0,60) width 109: "first font in the list."
RenderBlock {P} at (0,208) size 784x128
RenderText {#text} at (0,0) size 75x128
text run at (0,0) width 75 RTL: "\x{5D0}"
RenderText {#text} at (0,0) size 72x128
text run at (0,0) width 72 RTL: "\x{5D0}"
2011-11-20 Kenichi Ishibashi <bashi@chromium.org>
[Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
https://bugs.webkit.org/show_bug.cgi?id=72844
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.
2011-11-20 Noel Gordon <noel.gordon@gmail.com>
[chromium] Remove qt/QtMobileWebStyle from the gyp projects
......@@ -65,8 +65,6 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
return 0;
AtomicString atomicFamily(family.name);
// FIXME: Remove this #if after API transition complete.
#if 0
// Changes weight and/or italic of given FontDescription depends on
// the result of fontconfig so that keeping the correct font mapping
// of the given characters. See http://crbug.com/32109 for details.
......@@ -90,9 +88,6 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
platformData.setFakeBold(shouldSetFakeBold);
platformData.setFakeItalic(shouldSetFakeItalic);
return getCachedFontData(&platformData, DoNotRetain);
#else
return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, DoNotRetain), DoNotRetain);
#endif
}
SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font)
......
2011-11-20 Kenichi Ishibashi <bashi@chromium.org>
[Chromium] Remove old getFontFamilyForCharacters() and familyForChars() APIs.
https://bugs.webkit.org/show_bug.cgi?id=72844
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().
2011-10-17 Antonio Gomes <agomes@rim.com>
Pass a Frame* parameter in EditorClient::respondToChangedSelection
......
......@@ -51,8 +51,6 @@ public:
//
// Returns: the font family or an empty string if the request could not be
// satisfied.
// FIXME: Depreciated API. Remove later.
WEBKIT_EXPORT static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale);
// Returns: the font family instance. The instance has an empty font name if the request could not be satisfied.
WEBKIT_EXPORT static void familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily*);
......
......@@ -53,14 +53,9 @@ public:
//
// Returns a string with the font family on an empty string if the
// request cannot be satisfied.
// FIXME: Depreciated API. Remove later.
virtual WebString getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters, const char* preferredLocale) { return WebString(); }
// Returns a WebFontFamily instance with the font name. The instance has empty font name if the request cannot be satisfied.
// FIXME: Make this to be a pure virtual function after transition.
virtual void getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily* family)
{
family->name = getFontFamilyForCharacters(characters, numCharacters, preferredLocale).utf8();
}
virtual void getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily*) = 0;
virtual void getRenderStyleForStrike(const char* family, int sizeAndStyle, WebFontRenderStyle* style) = 0;
};
......
......@@ -40,14 +40,6 @@
namespace WebKit {
// FIXME: Depreciated API. Remove later.
WebCString WebFontInfo::familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale)
{
WebFontFamily family;
familyForChars(characters, numCharacters, preferredLocale, &family);
return family.name;
}
void WebFontInfo::familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily* family)
{
FcCharSet* cset = FcCharSetCreate();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment