Changeset 91777 in webkit


Ignore:
Timestamp:
Jul 26, 2011, 1:23:50 PM (14 years ago)
Author:
mitz@apple.com
Message:

Source/WebCore: <rdar://problem/9842889> Add a generic pictograph font family Add a generic pictograph font family
​https://bugs.webkit.org/show_bug.cgi?id=65197

Reviewed by Anders Carlsson.

Test: fast/css/font-family-pictograph.html

  • WebCore.exp.in: Export Settings::setPictographFontFamily().
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::identifierForFamily): Added -webkit-pictograph.

  • css/CSSFontSelector.cpp:

(WebCore::CSSFontSelector::addFontFaceRule): Ditto.
(WebCore::fontDataForGenericFamily): Ditto.

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty): Ditto.

  • css/CSSValueKeywords.in:
  • inspector/front-end/CSSKeywordCompletions.js: Ditto.
  • inspector/front-end/SourceCSSTokenizer.js: Ditto.

(WebInspector.SourceCSSTokenizer):

  • inspector/front-end/SourceCSSTokenizer.re2js: Ditto.
  • page/Settings.cpp:

(WebCore::Settings::pictographFontFamily): Added this getter.
(WebCore::Settings::setPictographFontFamily): Added this setter.

  • page/Settings.h:
  • platform/graphics/FontDescription.h: Added PictographFamily to the GenericFamilyType enum.

Source/WebKit/mac: <rdar://problem/9842889> Add a generic pictograph font family
​https://bugs.webkit.org/show_bug.cgi?id=65197

Reviewed by Anders Carlsson.

  • WebView/WebPreferenceKeysPrivate.h: Added WebKitPictographFontPreferenceKey.
  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]): Set the default pictograph font family to
"Apple Color Emoji".
(-[WebPreferences pictographFontFamily]): Added this getter.
(-[WebPreferences setPictographFontFamily:]): Added this setter.

  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm:

(-[WebView _preferencesChanged:]): Pass the preference through to WebCore.

Source/WebKit/win: <rdar://problem/9842889> Add a generic pictograph font family
​https://bugs.webkit.org/show_bug.cgi?id=65197

Reviewed by Anders Carlsson.

  • Interfaces/IWebPreferences.idl: Added pictographFontFamily() and

setPictographFontFamily().

  • WebPreferenceKeysPrivate.h: Added WebKitPictographFontPreferenceKey.
  • WebPreferences.cpp:

(WebPreferences::initializeDefaultSettings): Initialize the pictograph font
preference to "Times New Roman".
(WebPreferences::pictographFontFamily): Added this getter.
(WebPreferences::setPictographFontFamily): Added this setter.

  • WebPreferences.h:
  • WebView.cpp:

(WebView::notifyPreferencesChanged): Pass the preference value through to
WebCore.

Source/WebKit2: <rdar://problem/9842889> Add a generic pictograph font family
​https://bugs.webkit.org/show_bug.cgi?id=65197

Reviewed by Anders Carlsson.

  • Shared/WebPreferencesStore.h:
  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetPictographFontFamily): Added.
(WKPreferencesCopyPictographFontFamily): Added.

  • UIProcess/API/C/WKPreferences.h:

LayoutTests: <rdar://problem/9842889> Add a generic pictograph font family Add a generic pictograph font family
​https://bugs.webkit.org/show_bug.cgi?id=65197

Reviewed by Anders Carlsson.

  • fast/css/font-family-pictograph.html: Added.
  • platform/mac/fast/css/font-family-pictograph-expected.png: Added.
  • platform/mac/fast/css/font-family-pictograph-expected.txt: Added.
Location:
trunk
Files:
3 added
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r91775 r91777  
     12011-07-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9842889> Add a generic pictograph font family Add a generic pictograph font family
     4        https://bugs.webkit.org/show_bug.cgi?id=65197
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * fast/css/font-family-pictograph.html: Added.
     9        * platform/mac/fast/css/font-family-pictograph-expected.png: Added.
     10        * platform/mac/fast/css/font-family-pictograph-expected.txt: Added.
     11
    1122011-07-26  Adrienne Walker  <enne@google.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r91774 r91777  
     12011-07-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9842889> Add a generic pictograph font family Add a generic pictograph font family
     4        https://bugs.webkit.org/show_bug.cgi?id=65197
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Test: fast/css/font-family-pictograph.html
     9
     10        * WebCore.exp.in: Export Settings::setPictographFontFamily().
     11        * css/CSSComputedStyleDeclaration.cpp:
     12        (WebCore::identifierForFamily): Added -webkit-pictograph.
     13        * css/CSSFontSelector.cpp:
     14        (WebCore::CSSFontSelector::addFontFaceRule): Ditto.
     15        (WebCore::fontDataForGenericFamily): Ditto.
     16        * css/CSSStyleSelector.cpp:
     17        (WebCore::CSSStyleSelector::applyProperty): Ditto.
     18        * css/CSSValueKeywords.in:
     19        * inspector/front-end/CSSKeywordCompletions.js: Ditto.
     20        * inspector/front-end/SourceCSSTokenizer.js: Ditto.
     21        (WebInspector.SourceCSSTokenizer):
     22        * inspector/front-end/SourceCSSTokenizer.re2js: Ditto.
     23        * page/Settings.cpp:
     24        (WebCore::Settings::pictographFontFamily): Added this getter.
     25        (WebCore::Settings::setPictographFontFamily): Added this setter.
     26        * page/Settings.h:
     27        * platform/graphics/FontDescription.h: Added PictographFamily to the GenericFamilyType enum.
     28
    1292011-07-26  Viet-Trung Luu  <viettrungluu@chromium.org>
    230

  • trunk/Source/WebCore/WebCore.exp.in

    r91616 r91777  
    885885__ZN7WebCore8Settings23setLoadDeferringEnabledEb
    886886__ZN7WebCore8Settings23setNeedsTigerMailQuirksEb
     887__ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode
    887888__ZN7WebCore8Settings23setPluginAllowedRunTimeEj
    888889__ZN7WebCore8Settings23setUsesEncodingDetectorEb

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r91286 r91777  
    682682static int identifierForFamily(const AtomicString& family)
    683683{
    684     DEFINE_STATIC_LOCAL(AtomicString, cursiveFamily, ("-webkit-cursive"));
    685     DEFINE_STATIC_LOCAL(AtomicString, fantasyFamily, ("-webkit-fantasy"));
    686     DEFINE_STATIC_LOCAL(AtomicString, monospaceFamily, ("-webkit-monospace"));
    687     DEFINE_STATIC_LOCAL(AtomicString, sansSerifFamily, ("-webkit-sans-serif"));
    688     DEFINE_STATIC_LOCAL(AtomicString, serifFamily, ("-webkit-serif"));
     684    DEFINE_STATIC_LOCAL(AtomicString, cursiveFamily, ("-webkit-cursive"));
     685    DEFINE_STATIC_LOCAL(AtomicString, fantasyFamily, ("-webkit-fantasy"));
     686    DEFINE_STATIC_LOCAL(AtomicString, monospaceFamily, ("-webkit-monospace"));
     687    DEFINE_STATIC_LOCAL(AtomicString, pictographFamily, ("-webkit-pictograph"));
     688    DEFINE_STATIC_LOCAL(AtomicString, sansSerifFamily, ("-webkit-sans-serif"));
     689    DEFINE_STATIC_LOCAL(AtomicString, serifFamily, ("-webkit-serif"));
    689690    if (family == cursiveFamily)
    690691        return CSSValueCursive;
    … …  
    693694    if (family == monospaceFamily)
    694695        return CSSValueMonospace;
     696    if (family == pictographFamily)
     697        return CSSValueWebkitPictograph;
    695698    if (family == sansSerifFamily)
    696699        return CSSValueSansSerif;

  • trunk/Source/WebCore/css/CSSFontSelector.cpp

    r87239 r91777  
    311311                    familyName = "-webkit-monospace";
    312312                    break;
     313                case CSSValueWebkitPictograph:
     314                    familyName = "-webkit-pictograph";
     315                    break;
    313316                default:
    314317                    break;
    … …  
    400403    else if (familyName == "-webkit-monospace")
    401404        genericFamily = settings->fixedFontFamily();
     405    else if (familyName == "-webkit-pictograph")
     406        genericFamily = settings->pictographFontFamily();
    402407    else if (familyName == "-webkit-standard")
    403408        genericFamily = settings->standardFontFamily();

  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r91702 r91777  
    42134213                        face = "-webkit-monospace";
    42144214                        fontDescription.setGenericFamily(FontDescription::MonospaceFamily);
     4215                        break;
     4216                    case CSSValueWebkitPictograph:
     4217                        face = "-webkit-pictograph";
     4218                        fontDescription.setGenericFamily(FontDescription::PictographFamily);
    42154219                        break;
    42164220                }

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r91702 r91777  
    105105monospace
    106106-webkit-body
     107-webkit-pictograph
    107108//
    108109//

  • trunk/Source/WebCore/inspector/front-end/CSSKeywordCompletions.js

    r87894 r91777  
    290290        "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium",
    291291        "large", "x-large", "xx-large", "-webkit-xxx-large", "smaller", "larger", "serif", "sans-serif", "cursive",
    292         "fantasy", "monospace", "-webkit-body"
     292        "fantasy", "monospace", "-webkit-body", "-webkit-pictograph"
    293293    ],
    294294    "dominant-baseline": [
    … …  
    354354    ],
    355355    "font-family": [
    356         "serif", "sans-serif", "cursive", "fantasy", "monospace", "-webkit-body"
     356        "serif", "sans-serif", "cursive", "fantasy", "monospace", "-webkit-body", "-webkit-pictograph"
    357357    ],
    358358    "text-overflow-mode": [

  • trunk/Source/WebCore/inspector/front-end/SourceCSSTokenizer.js

    r86430 r91777  
    9494        "x-large", "x-small", "xor", "xx-large", "xx-small", "yellow", "-wap-marquee", "-webkit-activelink", "-webkit-auto", "-webkit-baseline-middle",
    9595        "-webkit-body", "-webkit-box", "-webkit-center", "-webkit-control", "-webkit-focus-ring-color", "-webkit-grab", "-webkit-grabbing",
    96         "-webkit-gradient", "-webkit-inline-box", "-webkit-left", "-webkit-link", "-webkit-marquee", "-webkit-mini-control", "-webkit-nowrap", "-webkit-right",
    97         "-webkit-small-control", "-webkit-text", "-webkit-xxx-large", "-webkit-zoom-in", "-webkit-zoom-out",
     96        "-webkit-gradient", "-webkit-inline-box", "-webkit-left", "-webkit-link", "-webkit-marquee", "-webkit-mini-control", "-webkit-nowrap", "-webkit-pictograph",
     97        "-webkit-right", "-webkit-small-control", "-webkit-text", "-webkit-xxx-large", "-webkit-zoom-in", "-webkit-zoom-out",
    9898    ].keySet();
    9999

  • trunk/Source/WebCore/inspector/front-end/SourceCSSTokenizer.re2js

    r86430 r91777  
    9393        "x-large", "x-small", "xor", "xx-large", "xx-small", "yellow", "-wap-marquee", "-webkit-activelink", "-webkit-auto", "-webkit-baseline-middle",
    9494        "-webkit-body", "-webkit-box", "-webkit-center", "-webkit-control", "-webkit-focus-ring-color", "-webkit-grab", "-webkit-grabbing",
    95         "-webkit-gradient", "-webkit-inline-box", "-webkit-left", "-webkit-link", "-webkit-marquee", "-webkit-mini-control", "-webkit-nowrap", "-webkit-right",
    96         "-webkit-small-control", "-webkit-text", "-webkit-xxx-large", "-webkit-zoom-in", "-webkit-zoom-out",
     95        "-webkit-gradient", "-webkit-inline-box", "-webkit-left", "-webkit-link", "-webkit-marquee", "-webkit-mini-control", "-webkit-nowrap", "-webkit-pictograph",
     96        "-webkit-right", "-webkit-small-control", "-webkit-text", "-webkit-xxx-large", "-webkit-zoom-in", "-webkit-zoom-out",
    9797    ].keySet();
    9898

  • trunk/Source/WebCore/page/Settings.cpp

    r91638 r91777  
    276276}
    277277
     278const AtomicString& Settings::pictographFontFamily(UScriptCode script) const
     279{
     280    return getGenericFontFamilyForScript(m_pictographFontFamilyMap, script);
     281}
     282
     283void Settings::setPictographFontFamily(const AtomicString& family, UScriptCode script)
     284{
     285    setGenericFontFamilyMap(m_pictographFontFamilyMap, family, script, m_page);
     286}
     287
    278288void Settings::setMinimumFontSize(int minimumFontSize)
    279289{

  • trunk/Source/WebCore/page/Settings.h

    r91638 r91777  
    8989        const AtomicString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) const;
    9090
     91        void setPictographFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON);
     92        const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const;
     93
    9194        void setMinimumFontSize(int);
    9295        int minimumFontSize() const { return m_minimumFontSize; }
    … …  
    463466        ScriptFontFamilyMap m_cursiveFontFamilyMap;
    464467        ScriptFontFamilyMap m_fantasyFontFamilyMap;
     468        ScriptFontFamilyMap m_pictographFontFamilyMap;
    465469        EditableLinkBehavior m_editableLinkBehavior;
    466470        TextDirectionSubmenuInclusionBehavior m_textDirectionSubmenuInclusionBehavior;

  • trunk/Source/WebCore/platform/graphics/FontDescription.h

    r89705 r91777  
    6565public:
    6666    enum GenericFamilyType { NoFamily, StandardFamily, SerifFamily, SansSerifFamily,
    67                              MonospaceFamily, CursiveFamily, FantasyFamily };
     67                             MonospaceFamily, CursiveFamily, FantasyFamily, PictographFamily };
    6868
    6969    FontDescription()

  • trunk/Source/WebKit/mac/ChangeLog

    r91727 r91777  
     12011-07-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9842889> Add a generic pictograph font family
     4        https://bugs.webkit.org/show_bug.cgi?id=65197
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebView/WebPreferenceKeysPrivate.h: Added WebKitPictographFontPreferenceKey.
     9        * WebView/WebPreferences.mm:
     10        (+[WebPreferences initialize]): Set the default pictograph font family to
     11        "Apple Color Emoji".
     12        (-[WebPreferences pictographFontFamily]): Added this getter.
     13        (-[WebPreferences setPictographFontFamily:]): Added this setter.
     14        * WebView/WebPreferencesPrivate.h:
     15        * WebView/WebView.mm:
     16        (-[WebView _preferencesChanged:]): Pass the preference through to WebCore.
     17
    1182011-07-25  Ian Henderson  <ianh@apple.com>
    219

  • trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

    r91232 r91777  
    3737#define WebKitCursiveFontPreferenceKey @"WebKitCursiveFont"
    3838#define WebKitFantasyFontPreferenceKey @"WebKitFantasyFont"
     39#define WebKitPictographFontPreferenceKey @"WebKitPictographFont"
    3940#define WebKitMinimumFontSizePreferenceKey @"WebKitMinimumFontSize"
    4041#define WebKitMinimumLogicalFontSizePreferenceKey @"WebKitMinimumLogicalFontSize"

  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r91232 r91777  
    307307        @"Apple Chancery",              WebKitCursiveFontPreferenceKey,
    308308        @"Papyrus",                     WebKitFantasyFontPreferenceKey,
     309        @"Apple Color Emoji",           WebKitPictographFontPreferenceKey,
    309310        @"0",                           WebKitMinimumFontSizePreferenceKey,
    310311        @"9",                           WebKitMinimumLogicalFontSizePreferenceKey,
    … …  
    15071508    [self _setBoolValue:flag forKey:WebKitMediaPlaybackAllowsInlinePreferenceKey];
    15081509}
     1510
     1511- (NSString *)pictographFontFamily
     1512{
     1513    return [self _stringValueForKey: WebKitPictographFontPreferenceKey];
     1514}
     1515
     1516- (void)setPictographFontFamily:(NSString *)family
     1517{
     1518    [self _setStringValue: family forKey: WebKitPictographFontPreferenceKey];
     1519}
     1520
    15091521@end
    15101522

  • trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

    r91232 r91777  
    217217- (BOOL)mediaPlaybackAllowsInline;
    218218
     219- (NSString *)pictographFontFamily;
     220- (void)setPictographFontFamily:(NSString *)family;
     221
    219222// Other private methods
    220223- (void)_postPreferencesChangedNotification;

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r91232 r91777  
    15101510    settings->setMinimumFontSize([preferences minimumFontSize]);
    15111511    settings->setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
     1512    settings->setPictographFontFamily([preferences pictographFontFamily]);
    15121513    settings->setPluginsEnabled([preferences arePlugInsEnabled]);
    15131514#if ENABLE(DATABASE)

  • trunk/Source/WebKit/win/ChangeLog

    r91232 r91777  
     12011-07-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9842889> Add a generic pictograph font family
     4        https://bugs.webkit.org/show_bug.cgi?id=65197
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Interfaces/IWebPreferences.idl: Added pictographFontFamily() and
     9        setPictographFontFamily().
     10        * WebPreferenceKeysPrivate.h: Added WebKitPictographFontPreferenceKey.
     11        * WebPreferences.cpp:
     12        (WebPreferences::initializeDefaultSettings): Initialize the pictograph font
     13        preference to "Times New Roman".
     14        (WebPreferences::pictographFontFamily): Added this getter.
     15        (WebPreferences::setPictographFontFamily): Added this setter.
     16        * WebPreferences.h:
     17        * WebView.cpp:
     18        (WebView::notifyPreferencesChanged): Pass the preference value through to
     19        WebCore.
     20
    1212011-07-18  Dean Jackson  <dino@apple.com>
    222

  • trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl

    r70975 r91777  
    9999    HRESULT setFantasyFontFamily([in] BSTR family);
    100100
     101    HRESULT pictographFontFamily([out, retval] BSTR* family);
     102    HRESULT setPictographFontFamily([in] BSTR family);
     103
    101104    HRESULT defaultFontSize([out, retval] int* fontSize);
    102105    HRESULT setDefaultFontSize([in] int fontSize);

  • trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h

    r91232 r91777  
    3737#define WebKitCursiveFontPreferenceKey "WebKitCursiveFont"
    3838#define WebKitFantasyFontPreferenceKey "WebKitFantasyFont"
     39#define WebKitPictographFontPreferenceKey "WebKitPictographFont"
    3940#define WebKitMinimumFontSizePreferenceKey "WebKitMinimumFontSize"
    4041#define WebKitMinimumLogicalFontSizePreferenceKey "WebKitMinimumLogicalFontSize"

  • trunk/Source/WebKit/win/WebPreferences.cpp

    r91232 r91777  
    190190    CFDictionaryAddValue(defaults, CFSTR(WebKitCursiveFontPreferenceKey), CFSTR("Comic Sans MS"));
    191191    CFDictionaryAddValue(defaults, CFSTR(WebKitFantasyFontPreferenceKey), CFSTR("Comic Sans MS"));
     192    CFDictionaryAddValue(defaults, CFSTR(WebKitPictographFontPreferenceKey), CFSTR("Times New Roman"));
    192193    CFDictionaryAddValue(defaults, CFSTR(WebKitMinimumFontSizePreferenceKey), CFSTR("0"));
    193194    CFDictionaryAddValue(defaults, CFSTR(WebKitMinimumLogicalFontSizePreferenceKey), CFSTR("9"));
    … …  
    653654}
    654655
     656HRESULT STDMETHODCALLTYPE WebPreferences::pictographFontFamily(
     657    /* [retval][out] */ BSTR* family)
     658{
     659    *family = stringValueForKey(CFSTR(WebKitPictographFontPreferenceKey));
     660    return (*family) ? S_OK : E_FAIL;
     661}
     662
     663HRESULT STDMETHODCALLTYPE WebPreferences::setPictographFontFamily(
     664    /* [in] */ BSTR family)
     665{
     666    setStringValue(CFSTR(WebKitPictographFontPreferenceKey), family);
     667    return S_OK;
     668}
     669
    655670HRESULT STDMETHODCALLTYPE WebPreferences::defaultFontSize(
    656671    /* [retval][out] */ int* fontSize)

  • trunk/Source/WebKit/win/WebPreferences.h

    r91232 r91777  
    9292        /* [in] */ BSTR family);
    9393   
     94    virtual HRESULT STDMETHODCALLTYPE pictographFontFamily(
     95        /* [retval][out] */ BSTR* family);
     96   
     97    virtual HRESULT STDMETHODCALLTYPE setPictographFontFamily(
     98        /* [in] */ BSTR family);
     99   
    94100    virtual HRESULT STDMETHODCALLTYPE defaultFontSize(
    95101        /* [retval][out] */ int* fontSize);

  • trunk/Source/WebKit/win/WebView.cpp

    r91232 r91777  
    45784578    SysFreeString(str);
    45794579
     4580    hr = preferences->pictographFontFamily(&str);
     4581    if (FAILED(hr))
     4582        return hr;
     4583    settings->setPictographFontFamily(AtomicString(str, SysStringLen(str)));
     4584    SysFreeString(str);
     4585
    45804586    hr = preferences->isJavaEnabled(&enabled);
    45814587    if (FAILED(hr))

  • trunk/Source/WebKit2/ChangeLog

    r91766 r91777  
     12011-07-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9842889> Add a generic pictograph font family
     4        https://bugs.webkit.org/show_bug.cgi?id=65197
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/WebPreferencesStore.h:
     9        * UIProcess/API/C/WKPreferences.cpp:
     10        (WKPreferencesSetPictographFontFamily): Added.
     11        (WKPreferencesCopyPictographFontFamily): Added.
     12        * UIProcess/API/C/WKPreferences.h:
     13
    1142011-07-26  Andras Becsi  <abecsi@webkit.org>
    215

  • trunk/Source/WebKit2/Shared/WebPreferencesStore.h

    r91232 r91777  
    110110    macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Arial") \
    111111    macro(SerifFontFamily, serifFontFamily, String, String, "Times New Roman") \
     112    macro(PictographFontFamily, pictographFontFamily, String, String, "Times New Roman") \
    112113    \
    113114
    … …  
    121122    macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
    122123    macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
     124    macro(PictographFontFamily, pictographFontFamily, String, String, "Apple Color Emoji") \
    123125    \
    124126

  • trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

    r91232 r91777  
    233233}
    234234
     235void WKPreferencesSetPictographFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
     236{
     237    toImpl(preferencesRef)->setPictographFontFamily(toWTFString(family));
     238}
     239
     240WKStringRef WKPreferencesCopyPictographFontFamily(WKPreferencesRef preferencesRef)
     241{
     242    return toCopiedAPI(toImpl(preferencesRef)->pictographFontFamily());
     243}
     244
    235245void WKPreferencesSetDefaultFontSize(WKPreferencesRef preferencesRef, uint32_t size)
    236246{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h

    r84648 r91777  
    108108WK_EXPORT WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef);
    109109
     110WK_EXPORT void WKPreferencesSetPictographFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
     111WK_EXPORT WKStringRef WKPreferencesCopyPictographFontFamily(WKPreferencesRef preferencesRef);
     112
    110113// Defaults to 16.
    111114WK_EXPORT void WKPreferencesSetDefaultFontSize(WKPreferencesRef preferencesRef, uint32_t);
Note: See TracChangeset for help on using the changeset viewer.