Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (93617 => 93618)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-08-23 18:27:51 UTC (rev 93617)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-08-23 18:30:33 UTC (rev 93618)
@@ -1,3 +1,21 @@
+2011-08-23 Matt Falkenhagen <[email protected]>
+
+ [chromium] Update WebSettings to support per-script font settings
+ https://bugs.webkit.org/show_bug.cgi?id=66220
+
+ Reviewed by Tony Chang.
+
+ * WebKit.gyp:
+ * 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-23 Nat Duca <[email protected]>
Unreviewd, roll chromium reverse DEPS 97698:97834
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (93617 => 93618)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-08-23 18:27:51 UTC (rev 93617)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-08-23 18:30:33 UTC (rev 93618)
@@ -69,12 +69,14 @@
'dependencies': [
'../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
'<(chromium_src_dir)/skia/skia.gyp:skia',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
'<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
],
'export_dependent_settings': [
'<(chromium_src_dir)/skia/skia.gyp:skia',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
],
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (93617 => 93618)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2011-08-23 18:27:51 UTC (rev 93617)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2011-08-23 18:30:33 UTC (rev 93618)
@@ -32,6 +32,7 @@
#define WebSettings_h
#include "WebCommon.h"
+#include <unicode/uscript.h>
#define HAS_WEBAUDIO_FEATURE_ENABLE 1
@@ -51,12 +52,12 @@
EditingBehaviorUnix
};
- 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;
virtual void setMinimumFontSize(int) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (93617 => 93618)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-08-23 18:27:51 UTC (rev 93617)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-08-23 18:30:33 UTC (rev 93618)
@@ -54,34 +54,34 @@
ASSERT(settings);
}
-void WebSettingsImpl::setStandardFontFamily(const WebString& font)
+void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setStandardFontFamily(font);
+ m_settings->setStandardFontFamily(font, script);
}
-void WebSettingsImpl::setFixedFontFamily(const WebString& font)
+void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setFixedFontFamily((String)font);
+ m_settings->setFixedFontFamily(font, script);
}
-void WebSettingsImpl::setSerifFontFamily(const WebString& font)
+void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setSerifFontFamily((String)font);
+ m_settings->setSerifFontFamily(font, script);
}
-void WebSettingsImpl::setSansSerifFontFamily(const WebString& font)
+void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setSansSerifFontFamily((String)font);
+ m_settings->setSansSerifFontFamily(font, script);
}
-void WebSettingsImpl::setCursiveFontFamily(const WebString& font)
+void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setCursiveFontFamily((String)font);
+ m_settings->setCursiveFontFamily(font, script);
}
-void WebSettingsImpl::setFantasyFontFamily(const WebString& font)
+void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setFantasyFontFamily((String)font);
+ m_settings->setFantasyFontFamily(font, script);
}
void WebSettingsImpl::setDefaultFontSize(int size)
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (93617 => 93618)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-08-23 18:27:51 UTC (rev 93617)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-08-23 18:30:33 UTC (rev 93618)
@@ -44,12 +44,12 @@
explicit WebSettingsImpl(WebCore::Settings*);
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);
virtual void setMinimumFontSize(int);
