Source/WebCore: <rdar://problem/9842889> Add a generic pictograph font family Add...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Jul 2011 20:23:50 +0000 (20:23 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Jul 2011 20:23:50 +0000 (20:23 +0000)
commit676a200bd5cd47bd91421d6e94127b094ee79c2a
tree15fea96f28d2e07da72e7662453727f0be0aa0dc
parent5c7be017d0f9a37265cf6992f00a09e77b32ba86
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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@91777 268f45cc-cd09-0410-ab3c-d52691b4dbfc
31 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/css/font-family-pictograph.html [new file with mode: 0644]
LayoutTests/platform/mac/fast/css/font-family-pictograph-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/fast/css/font-family-pictograph-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSFontSelector.cpp
Source/WebCore/css/CSSStyleSelector.cpp
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/inspector/front-end/CSSKeywordCompletions.js
Source/WebCore/inspector/front-end/SourceCSSTokenizer.js
Source/WebCore/inspector/front-end/SourceCSSTokenizer.re2js
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebCore/platform/graphics/FontDescription.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/Interfaces/IWebPreferences.idl
Source/WebKit/win/WebPreferenceKeysPrivate.h
Source/WebKit/win/WebPreferences.cpp
Source/WebKit/win/WebPreferences.h
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesStore.h
Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
Source/WebKit2/UIProcess/API/C/WKPreferences.h