diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /webkit/glue/webpreferences.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'webkit/glue/webpreferences.cc')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index afc39bd..abe5903 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -21,11 +21,11 @@ using WebKit::WebURL; using WebKit::WebView; WebPreferences::WebPreferences() - : standard_font_family(L"Times New Roman"), - fixed_font_family(L"Courier New"), - serif_font_family(L"Times New Roman"), - sans_serif_font_family(L"Arial"), - cursive_font_family(L"Script"), + : standard_font_family(ASCIIToUTF16("Times New Roman")), + fixed_font_family(ASCIIToUTF16("Courier New")), + serif_font_family(ASCIIToUTF16("Times New Roman")), + sans_serif_font_family(ASCIIToUTF16("Arial")), + cursive_font_family(ASCIIToUTF16("Script")), fantasy_font_family(), // Not sure what to use on Windows. default_font_size(16), default_fixed_font_size(13), @@ -73,12 +73,12 @@ WebPreferences::~WebPreferences() { void WebPreferences::Apply(WebView* web_view) const { WebSettings* settings = web_view->settings(); - settings->setStandardFontFamily(WideToUTF16Hack(standard_font_family)); - settings->setFixedFontFamily(WideToUTF16Hack(fixed_font_family)); - settings->setSerifFontFamily(WideToUTF16Hack(serif_font_family)); - settings->setSansSerifFontFamily(WideToUTF16Hack(sans_serif_font_family)); - settings->setCursiveFontFamily(WideToUTF16Hack(cursive_font_family)); - settings->setFantasyFontFamily(WideToUTF16Hack(fantasy_font_family)); + settings->setStandardFontFamily(standard_font_family); + settings->setFixedFontFamily(fixed_font_family); + settings->setSerifFontFamily(serif_font_family); + settings->setSansSerifFontFamily(sans_serif_font_family); + settings->setCursiveFontFamily(cursive_font_family); + settings->setFantasyFontFamily(fantasy_font_family); settings->setDefaultFontSize(default_font_size); settings->setDefaultFixedFontSize(default_fixed_font_size); settings->setMinimumFontSize(minimum_font_size); @@ -142,7 +142,7 @@ void WebPreferences::Apply(WebView* web_view) const { // Enable experimental WebGL support if requested on command line // and support is compiled in. bool enable_webgl = - WebRuntimeFeatures::isWebGLEnabled() || experimental_webgl_enabled; + WebRuntimeFeatures::isWebGLEnabled() && experimental_webgl_enabled; settings->setExperimentalWebGLEnabled(enable_webgl); // Display colored borders around composited render layers if requested |