Changeset 112116 in webkit

Timestamp:

Mar 26, 2012 10:04:39 AM (12 years ago)

Author:

pierre.rossi@gmail.com

Message:

[Qt][WK2] default families are not set in QWebPreferences
​https://bugs.webkit.org/show_bug.cgi?id=81933

This would result in an attempt to create FontPlatformData
with the -webkit- prefixed family name.
Logic adapted from QWebSettings.

Patch by Pierre Rossi <​pierre.rossi@nokia.com> on 2012-03-26
Reviewed by Kenneth Rohde Christiansen.

• UIProcess/API/qt/qwebpreferences.cpp:

(QWebPreferencesPrivate::createPreferences):
(QWebPreferencesPrivate::initFontDefaults):

• UIProcess/API/qt/qwebpreferences_p_p.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qwebpreferences.cpp (modified) (2 diffs)
• UIProcess/API/qt/qwebpreferences_p_p.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-26  Pierre Rossi  <pierre.rossi@nokia.com>
+
+        [Qt][WK2] default families are not set in QWebPreferences
+        https://bugs.webkit.org/show_bug.cgi?id=81933
+
+        This would result in an attempt to create FontPlatformData
+        with the -webkit- prefixed family name.
+        Logic adapted from QWebSettings.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/API/qt/qwebpreferences.cpp:
+        (QWebPreferencesPrivate::createPreferences):
+        (QWebPreferencesPrivate::initFontDefaults):
+        * UIProcess/API/qt/qwebpreferences_p_p.h:
+
 2012-03-26  Dinu Jacob  <dinu.jacob@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp

@@ -33 +33 @@
     QWebPreferences* prefs = new QWebPreferences;
     prefs->d->webViewPrivate = webViewPrivate;
+    prefs->d->initializeDefaultFontSettings();
     return prefs;
 }
@@ -98 +99 @@
 }
 
+void QWebPreferencesPrivate::initializeDefaultFontSettings()
+{
+    setFontSize(MinimumFontSize, 0);
+    setFontSize(DefaultFontSize, 16);
+    setFontSize(DefaultFixedFontSize, 13);
+
+    QFont defaultFont;
+    defaultFont.setStyleHint(QFont::Serif);
+    setFontFamily(StandardFont, defaultFont.defaultFamily());
+    setFontFamily(SerifFont, defaultFont.defaultFamily());
+
+    defaultFont.setStyleHint(QFont::Fantasy);
+    setFontFamily(FantasyFont, defaultFont.defaultFamily());
+
+    defaultFont.setStyleHint(QFont::Cursive);
+    setFontFamily(CursiveFont, defaultFont.defaultFamily());
+
+    defaultFont.setStyleHint(QFont::SansSerif);
+    setFontFamily(SansSerifFont, defaultFont.defaultFamily());
+
+    defaultFont.setStyleHint(QFont::Monospace);
+    setFontFamily(FixedFont, defaultFont.defaultFamily());
+}
+
 void QWebPreferencesPrivate::setFontFamily(QWebPreferencesPrivate::FontFamily which, const QString& family)
 {

trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h

@@ -60 +60 @@
     bool testAttribute(WebAttribute attr) const;
 
+    void initFontDefaults();
     void setFontFamily(FontFamily which, const QString& family);
     QString fontFamily(FontFamily which) const;