Changeset 124808 in webkit


Ignore:
Timestamp:
Aug 6, 2012 4:05:15 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt] Default sizes for input-text and text-area are different when running DRT/WTR
​https://bugs.webkit.org/show_bug.cgi?id=91990

Patch by Luciano Wolf <Luciano Miguel Wolf> on 2012-08-06
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

WTR wasn't using the proper font types provided by testfonts directory.
The same approach as DRT was applied and now it takes info from QFont to
update the store variable.

  • UIProcess/qt/WebPreferencesQt.cpp:

(WebKit::setStringValueIfInUserDefaults):
(WebKit):
(WebKit::WebPreferences::platformInitializeStore):

Tools:

Initializing TestFonts information into WTR binary. Doing it
later leads to wrong font names usage (Dejavu Serif instead
of Liberation Serif).

  • WebKitTestRunner/Target.pri:
  • WebKitTestRunner/qt/main.cpp:

(main):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r124805 r124808  
     12012-08-06  Luciano Wolf  <luciano.wolf@openbossa.org>
     2
     3        [Qt] Default sizes for input-text and text-area are different when running DRT/WTR
     4        https://bugs.webkit.org/show_bug.cgi?id=91990
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        WTR wasn't using the proper font types provided by testfonts directory.
     9        The same approach as DRT was applied and now it takes info from QFont to
     10        update the store variable.
     11
     12        * UIProcess/qt/WebPreferencesQt.cpp:
     13        (WebKit::setStringValueIfInUserDefaults):
     14        (WebKit):
     15        (WebKit::WebPreferences::platformInitializeStore):
     16
    1172012-08-06  No'am Rosenthal  <noam.rosenthal@nokia.com>
    218

  • trunk/Source/WebKit2/UIProcess/qt/WebPreferencesQt.cpp

    r95901 r124808  
    2626#include "config.h"
    2727#include "WebPreferences.h"
     28#include <QFont>
    2829
    2930namespace WebKit {
    3031
     32static void setStringValueIfInUserDefaults(const String& baseKey, WebPreferencesStore& store, const QHash<String, QFont::StyleHint> qFontHint)
     33{
     34    // Use same approach as DumpRenderTree does - get font info from QFont.
     35    static QFont defaultFont;
     36    defaultFont.setStyleHint(qFontHint[baseKey]);
     37    store.setStringValueForKey(baseKey, defaultFont.defaultFamily());
     38}
     39
    3140void WebPreferences::platformInitializeStore()
    3241{
     42    if (!m_identifier)
     43        return;
     44
     45    QHash <String, QFont::StyleHint> qFontHint;
     46
     47    qFontHint["StandardFontFamily"] = QFont::Serif;
     48    qFontHint["CursiveFontFamily"] = QFont::Cursive;
     49    qFontHint["FantasyFontFamily"] = QFont::Fantasy;
     50    qFontHint["FixedFontFamily"] = QFont::Monospace;
     51    qFontHint["SansSerifFontFamily"] = QFont::SansSerif;
     52    qFontHint["SerifFontFamily"] = QFont::Serif;
     53    qFontHint["PictographFontFamily"] = QFont::Serif;
     54
     55#define INITIALIZE_FONT_PREFERENCES(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
     56    set##TypeName##ValueIfInUserDefaults(WebPreferencesKey::KeyLower##Key(), m_store, qFontHint);
     57
     58    FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(INITIALIZE_FONT_PREFERENCES)
     59
     60#undef INITIALIZE_FONT_PREFERENCES
    3361}
    3462

  • trunk/Tools/ChangeLog

    r124807 r124808  
     12012-08-06  Luciano Wolf  <luciano.wolf@openbossa.org>
     2
     3        [Qt] Default sizes for input-text and text-area are different when running DRT/WTR
     4        https://bugs.webkit.org/show_bug.cgi?id=91990
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Initializing TestFonts information into WTR binary. Doing it
     9        later leads to wrong font names usage (Dejavu Serif instead
     10        of Liberation Serif).
     11
     12        * WebKitTestRunner/Target.pri:
     13        * WebKitTestRunner/qt/main.cpp:
     14        (main):
     15
    1162012-08-06  Jeff Timanus  <twiz@chromium.org>
    217

  • trunk/Tools/WebKitTestRunner/Target.pri

    r121851 r124808  
    99
    1010HEADERS += \
     11    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.h \
    1112    EventSenderProxy.h \
    1213    PlatformWebView.h \
    … …  
    1617
    1718SOURCES += \
     19    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \
    1820    qt/main.cpp \
    1921    qt/EventSenderProxyQt.cpp \
    … …  
    3234DEFINES += USE_SYSTEM_MALLOC=1
    3335
     36contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
     37
     38INCLUDEPATH += \
     39    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt
     40
    3441PREFIX_HEADER = WebKitTestRunnerPrefix.h
    3542*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"

  • trunk/Tools/WebKitTestRunner/qt/main.cpp

    r116417 r124808  
    2727#include "config.h"
    2828
     29#include "QtInitializeTestFonts.h"
    2930#include "TestController.h"
    3031#include "qquickwebview_p.h"
    … …  
    119120    qputenv("QT_WEBKIT_THEME_NAME", "qstyle");
    120121
     122    WebKit::initializeTestFonts();
     123    QCoreApplication::setAttribute(Qt::AA_Use96Dpi, true);
     124
    121125    QQuickWebViewExperimental::setFlickableViewportEnabled(false);
    122126    QApplication app(argc, argv);
Note: See TracChangeset for help on using the changeset viewer.