diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2012-12-06 15:01:28 +0000 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2012-12-07 13:17:24 +0100 |
| commit | 8d7ca597a397207181d3176c555b5a24df8db209 (patch) | |
| tree | ea14fc8b34fb3f91b1a64b57f5f9c171061e59b0 /Source/WebKit/qt/WidgetApi/qwebpage.cpp | |
| parent | 08d610737197b47bdfc7f78b0f712c337cc87286 (diff) | |
| download | qtwebkit-8d7ca597a397207181d3176c555b5a24df8db209.tar.gz | |
QWebView uses the mobile style and doesn't follow Qt's style
https://bugs.webkit.org/show_bug.cgi?id=104134
Reviewed by Simon Hausmann.
Another issue introduced by r136235.
Fix the order of initialization of the styleFactory and creation of the
WebCore Page. Since the latter has a RenderTheme member and the creation
of the appropriate RenderTheme type (QStyle-backed) is dependant on having
first initialized the theme factory function, we need to postpone this just
a little bit.
* WebCoreSupport/QWebPageAdapter.cpp:
(QWebPageAdapter::QWebPageAdapter):
(QWebPageAdapter::initializeWebCorePage): Added.
* WebCoreSupport/QWebPageAdapter.h:
* WidgetApi/qwebpage.cpp:
(QWebPagePrivate::QWebPagePrivate): call initializeWebCorePage only after
having initialized WebKitWidgets related logic (QStyle hooks in this case).
Change-Id: I46bb066bbf4f5e4968bfdfb9def9ebcba6e02843
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index c1176cf66..f9cec3e54 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -201,6 +201,7 @@ QWebPagePrivate::QWebPagePrivate(QWebPage *qq) , m_lastDropAction(Qt::IgnoreAction) { WebKit::initializeWebKitWidgets(); + initializeWebCorePage(); memset(actions, 0, sizeof(actions)); #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) |