Changeset 93575 in webkit

Timestamp:

Aug 22, 2011 7:15:22 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Update WebSettings to support per-script font settings
​https://bugs.webkit.org/show_bug.cgi?id=66220

Patch by Matt Falkenhagen <​falken@chromium.org> on 2011-08-22
Reviewed by Tony Chang.

• public/WebSettings.h:
• src/WebSettingsImpl.cpp:

(WebKit::WebSettingsImpl::setStandardFontFamily):
(WebKit::WebSettingsImpl::setFixedFontFamily):
(WebKit::WebSettingsImpl::setSerifFontFamily):
(WebKit::WebSettingsImpl::setSansSerifFontFamily):
(WebKit::WebSettingsImpl::setCursiveFontFamily):
(WebKit::WebSettingsImpl::setFantasyFontFamily):

• src/WebSettingsImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebSettings.h (modified) (2 diffs)
• src/WebSettingsImpl.cpp (modified) (1 diff)
• src/WebSettingsImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-22  Matt Falkenhagen  <falken@chromium.org>
+
+        [chromium] Update WebSettings to support per-script font settings
+        https://bugs.webkit.org/show_bug.cgi?id=66220
+
+        Reviewed by Tony Chang.
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setStandardFontFamily):
+        (WebKit::WebSettingsImpl::setFixedFontFamily):
+        (WebKit::WebSettingsImpl::setSerifFontFamily):
+        (WebKit::WebSettingsImpl::setSansSerifFontFamily):
+        (WebKit::WebSettingsImpl::setCursiveFontFamily):
+        (WebKit::WebSettingsImpl::setFantasyFontFamily):
+        * src/WebSettingsImpl.h:
+
 2011-08-22  Iain Merrick  <husky@google.com>
 

trunk/Source/WebKit/chromium/public/WebSettings.h

@@ -33 +33 @@
 
 #include "WebCommon.h"
+#if WEBKIT_IMPLEMENTATION
+#include <wtf/unicode/Unicode.h>
+#else
+#include <unicode/uchar.h>
+#include <unicode/uscript.h>
+#endif
 
 #define HAS_WEBAUDIO_FEATURE_ENABLE 1
@@ -52 +58 @@
     };
 
-    virtual void setStandardFontFamily(const WebString&) = 0;
-    virtual void setFixedFontFamily(const WebString&) = 0;
-    virtual void setSerifFontFamily(const WebString&) = 0;
-    virtual void setSansSerifFontFamily(const WebString&) = 0;
-    virtual void setCursiveFontFamily(const WebString&) = 0;
-    virtual void setFantasyFontFamily(const WebString&) = 0;
+    virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
+    virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
+    virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
+    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 setDefaultFontSize(int) = 0;
     virtual void setDefaultFixedFontSize(int) = 0;

trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp

@@ -55 +55 @@
 }
 
-void WebSettingsImpl::setStandardFontFamily(const WebString& font)
-{
-    m_settings->setStandardFontFamily(font);
-}
-
-void WebSettingsImpl::setFixedFontFamily(const WebString& font)
-{
-    m_settings->setFixedFontFamily((String)font);
-}
-
-void WebSettingsImpl::setSerifFontFamily(const WebString& font)
-{
-    m_settings->setSerifFontFamily((String)font);
-}
-
-void WebSettingsImpl::setSansSerifFontFamily(const WebString& font)
-{
-    m_settings->setSansSerifFontFamily((String)font);
-}
-
-void WebSettingsImpl::setCursiveFontFamily(const WebString& font)
-{
-    m_settings->setCursiveFontFamily((String)font);
-}
-
-void WebSettingsImpl::setFantasyFontFamily(const WebString& font)
-{
-    m_settings->setFantasyFontFamily((String)font);
+void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setStandardFontFamily(font, script);
+}
+
+void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setFixedFontFamily(font, script);
+}
+
+void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setSerifFontFamily(font, script);
+}
+
+void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setSansSerifFontFamily(font, script);
+}
+
+void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setCursiveFontFamily(font, script);
+}
+
+void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setFantasyFontFamily(font, script);
 }
 

trunk/Source/WebKit/chromium/src/WebSettingsImpl.h

@@ -45 +45 @@
     virtual ~WebSettingsImpl() { }
 
-    virtual void setStandardFontFamily(const WebString&);
-    virtual void setFixedFontFamily(const WebString&);
-    virtual void setSerifFontFamily(const WebString&);
-    virtual void setSansSerifFontFamily(const WebString&);
-    virtual void setCursiveFontFamily(const WebString&);
-    virtual void setFantasyFontFamily(const WebString&);
+    virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
+    virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
+    virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
+    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 setDefaultFontSize(int);
     virtual void setDefaultFixedFontSize(int);