Title: [119600] trunk/Source/WebKit/chromium
- Revision
- 119600
- Author
- [email protected]
- Date
- 2012-06-06 11:00:47 -0700 (Wed, 06 Jun 2012)
Log Message
[chromium] Expose setPictographFontFamily through the chromium webkit api.
https://bugs.webkit.org/show_bug.cgi?id=88393
Reviewed by Adam Barth.
This was added to WebCore in
https://bugs.webkit.org/show_bug.cgi?id=65197
* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::setPictographFontFamily):
(WebKit):
* src/WebSettingsImpl.h:
(WebSettingsImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (119599 => 119600)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-06 17:58:13 UTC (rev 119599)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-06 18:00:47 UTC (rev 119600)
@@ -1,3 +1,20 @@
+2012-06-06 Nico Weber <[email protected]>
+
+ [chromium] Expose setPictographFontFamily through the chromium webkit api.
+ https://bugs.webkit.org/show_bug.cgi?id=88393
+
+ Reviewed by Adam Barth.
+
+ This was added to WebCore in
+ https://bugs.webkit.org/show_bug.cgi?id=65197
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setPictographFontFamily):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-06-06 Ryosuke Niwa <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (119599 => 119600)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-06 17:58:13 UTC (rev 119599)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-06 18:00:47 UTC (rev 119600)
@@ -59,6 +59,7 @@
virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
+ virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setDefaultFontSize(int) = 0;
virtual void setDefaultFixedFontSize(int) = 0;
virtual void setMinimumFontSize(int) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (119599 => 119600)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-06 17:58:13 UTC (rev 119599)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-06 18:00:47 UTC (rev 119600)
@@ -89,6 +89,11 @@
m_settings->setFantasyFontFamily(font, script);
}
+void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script)
+{
+ m_settings->setPictographFontFamily(font, script);
+}
+
void WebSettingsImpl::setDefaultFontSize(int size)
{
m_settings->setDefaultFontSize(size);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (119599 => 119600)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-06 17:58:13 UTC (rev 119599)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-06 18:00:47 UTC (rev 119600)
@@ -50,6 +50,7 @@
virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
+ virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setDefaultFontSize(int);
virtual void setDefaultFixedFontSize(int);
virtual void setMinimumFontSize(int);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
