Imported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (http://svn.webkit.org/repository/webkit/trunk@135696)

New snapshot that fixes build after QMacStyle removal

Change-Id: Idea95c96c73b49158d52861db2a4b8d2c51766b0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

4 files changed, 78 insertions, 10 deletions

diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp
index 65624d190..81571b05b 100644
--- a/Source/WebKit/qt/Api/qwebpage.cpp
+++ b/Source/WebKit/qt/Api/qwebpage.cpp
@@ -68,7 +68,6 @@
 #include "HTMLNames.h"
 #include "HitTestResult.h"
 #include "Image.h"
-#include "InitWebCoreQt.h"
 #include "InitWebKitQt.h"
 #include "InspectorClientQt.h"
 #include "InspectorClientWebPage.h"
@@ -326,7 +325,6 @@ QWebPagePrivate::QWebPagePrivate(QWebPage *qq)
 #endif
 
     WebKit::initializeWebKitWidgets();
-    WebCore::initializeWebCoreQt();
 
     Page::PageClients pageClients;
     pageClients.chromeClient = new ChromeClientQt(this);
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 4b0852a0c..af879c5b5 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,72 @@
+2012-11-26  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] QStyleFacadeImp build break with latest Qt 5
+        https://bugs.webkit.org/show_bug.cgi?id=103198
+
+        Reviewed by Simon Hausmann.
+
+        Original patch by J-P Nurmi <jpnurmi@digia.com>.
+
+        Fixes QtWebKit build by replacing qobject_cast to
+        QMacStyle with calls to QObject::inherits. Also
+        replaces Q_WS_MAC preprocesser directives with Q_OS_MAC
+        for Qt 5 compatibility.
+
+        * WebCoreSupport/QStyleFacadeImp.cpp:
+        (WebKit::QStyleFacadeImp::getButtonMetrics):
+        (WebKit::QStyleFacadeImp::paintComboBox):
+        (WebKit::QStyleFacadeImp::paintInnerSpinButton):
+        (WebKit::QStyleFacadeImp::paintScrollBar):
+
+2012-11-24  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r135648 and r135649.
+        http://trac.webkit.org/changeset/135648
+        http://trac.webkit.org/changeset/135649
+        https://bugs.webkit.org/show_bug.cgi?id=103176
+
+        This change cannot be built with a qt-minimal configuration.
+        (Requested by zalbisser on #webkit).
+
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
+
+2012-11-24  Zeno Albisser  <zeno@webkit.org>
+
+        Unreviewed Qt build fix:
+
+        Make sure QGLWidget definition is available.
+
+        * WebCoreSupport/PageClientQt.cpp:
+
+2012-11-24  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt] Make sure the QGLWidget context is current when creating the TextureMapper.
+        https://bugs.webkit.org/show_bug.cgi?id=103142
+
+        When creating the TextureMapperGL for WK1 we have to make sure
+        that the GL context provided by the QGLWidget is current.
+        Otherwise the GraphicsContext3DQt created by TextureMapperGL will pick up
+        the wrong pointer by calling QOpenGLContext::currentContext().
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
+
+2012-11-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r135575.
+        http://trac.webkit.org/changeset/135575
+        https://bugs.webkit.org/show_bug.cgi?id=103169
+
+        It made all tests assert (Requested by Ossy on #webkit).
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+        * WebCoreSupport/InitWebCoreQt.cpp:
+        (WebKit::initializeWebKitQt):
+
 2012-11-23  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         tst_qwebpage fails after QMimeDatabase patch
diff --git a/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp b/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
index 385fe9c39..e75b852fe 100644
--- a/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
@@ -62,6 +62,8 @@ Q_DECL_EXPORT void initializeWebKitQt()
         WebCore::RenderThemeQStyle::setStyleFactoryFunction(initCallback);
         WebCore::RenderThemeQt::setCustomTheme(WebCore::RenderThemeQStyle::create, new WebCore::ScrollbarThemeQStyle);
     }
+
+    WebCore::initializeWebCoreQt();
 }
 
 Q_DECL_EXPORT void setImagePlatformResource(const char* name, const QPixmap& pixmap)
diff --git a/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp
index 7fc5cc56e..3af6cf694 100644
--- a/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp
@@ -27,7 +27,6 @@
 
 #include <QApplication>
 #include <QLineEdit>
-#include <QMacStyle>
 #include <QPainter>
 #include <QPushButton>
 #include <QStyleFactory>
@@ -221,7 +220,7 @@ void QStyleFacadeImp::getButtonMetrics(QString *buttonFontFamily, int *buttonFon
     QFont defaultButtonFont = QApplication::font(&button);
     *buttonFontFamily = defaultButtonFont.family();
     *buttonFontPixelSize = 0;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     button.setAttribute(Qt::WA_MacSmallSize);
     QFontInfo fontInfo(defaultButtonFont);
     *buttonFontPixelSize = fontInfo.pixelSize();
@@ -275,11 +274,11 @@ void QStyleFacadeImp::paintComboBox(QPainter *painter, const QStyleFacadeOption
 
     IntRect rect = opt.rect;
 
-#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
+#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
     // QMacStyle makes the combo boxes a little bit smaller to leave space for the focus rect.
     // Because of it, the combo button is drawn at a point to the left of where it was expect to be and may end up
     // overlapped with the text. This will force QMacStyle to draw the combo box with the expected width.
-    if (qobject_cast<QMacStyle*>(m_style))
+    if (m_style->inherits("QMacStyle"))
         rect.inflateX(3);
 #endif
 
@@ -359,11 +358,11 @@ void QStyleFacadeImp::paintInnerSpinButton(QPainter* painter, const QStyleFacade
     // Default to moving the buttons a little bit within the editor frame.
     int inflateX = -2;
     int inflateY = -2;
-#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
+#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
     // QMacStyle will position the aqua buttons flush to the right.
     // This will move them more within the control for better style, a la
     // Chromium look & feel.
-    if (qobject_cast<QMacStyle*>(m_style)) {
+    if (m_style->inherits("QMacStyle")) {
         inflateX = -4;
         // Render mini aqua spin buttons for QMacStyle to fit nicely into
         // the editor area, like Chromium.
@@ -451,10 +450,10 @@ void QStyleFacadeImp::paintScrollBar(QPainter *painter, const QStyleFacadeOption
 
     MappedStyleOption<QStyleOptionSlider> opt(widget, proxyOption);
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // FIXME: We also need to check the widget style but today ScrollbarTheme is not aware of the page so we
     // can't get the widget.
-    if (qobject_cast<QMacStyle*>(m_style))
+    if (m_style->inherits("QMacStyle"))
         m_style->drawComplexControl(QStyle::CC_ScrollBar, &opt, painter, widget);
     else
 #endif