Changeset 53802 in webkit

Timestamp:

Jan 25, 2010 6:42:28 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-25 Simon Hausmann <Simon Hausmann>

Reviewed by Kenneth Rohde Christiansen.

[Qt] In RenderThemeQt determine the QStyle from the page client instead of the page's view
​https://bugs.webkit.org/show_bug.cgi?id=34053

• platform/qt/QWebPageClient.h: Add function to return the style.
• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::qStyle): Determine the style from the page client instead of the page's view.

2010-01-25 Simon Hausmann <Simon Hausmann>

Reviewed by Kenneth Rohde Christiansen.

[Qt] In RenderThemeQt determine the QStyle from the page client instead of the page's view
​https://bugs.webkit.org/show_bug.cgi?id=34053

• Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::style): Implement QWebPageClient::style() and return the graphics widget's style.
• Api/qwebpage.cpp: (QWebPageWidgetClient::style): Implement QWebPageClient::style() and return the widget's style.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/QWebPageClient.h (modified) (2 diffs)
• WebCore/platform/qt/RenderThemeQt.cpp (modified) (1 diff)
• WebKit/qt/Api/qgraphicswebview.cpp (modified) (2 diffs)
• WebKit/qt/Api/qwebpage.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-25  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] In RenderThemeQt determine the QStyle from the page client instead of the page's view
+        https://bugs.webkit.org/show_bug.cgi?id=34053
+
+        * platform/qt/QWebPageClient.h: Add function to return the style.
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::qStyle): Determine the style from the page client instead of the page's view.
+
 2010-01-25  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebCore/platform/qt/QWebPageClient.h

@@ -32 +32 @@
 
 #include <QRect>
+
+QT_BEGIN_NAMESPACE
 class QGraphicsItem;
+class QStyle;
+QT_END_NAMESPACE
 
 class QWebPageClient {
@@ -80 +84 @@
     virtual QObject* pluginParent() const = 0;
 
+    virtual QStyle* style() const = 0;
+
 protected:
 #ifndef QT_NO_CURSOR

trunk/WebCore/platform/qt/RenderThemeQt.cpp

@@ -161 +161 @@
 {
     if (m_page) {
-        ChromeClientQt* client = static_cast<ChromeClientQt*>(m_page->chrome()->client());
-
-        if (!client->m_webPage)
-            return QApplication::style();
-
-        if (QWidget* view = client->m_webPage->view())
-            return view->style();
+        QWebPageClient* pageClient = m_page->chrome()->client()->platformPageClient();
+
+        if (pageClient)
+            return pageClient->style();
     }
 

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -109 +109 @@
     virtual QObject* pluginParent() const;
 
+    virtual QStyle* style() const;
+
 #if USE(ACCELERATED_COMPOSITING)
     virtual void setRootGraphicsLayer(QGraphicsItem* layer);
@@ -290 +292 @@
 {
     return q;
+}
+
+QStyle* QGraphicsWebViewPrivate::style() const
+{
+    return q->style();
 }
 

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -173 +173 @@
     virtual QObject* pluginParent() const;
 
+    virtual QStyle* style() const;
+
     QWidget* view;
 };
@@ -240 +242 @@
 {
     return view;
+}
+
+QStyle* QWebPageWidgetClient::style() const
+{
+    return view->style();
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-01-25  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] In RenderThemeQt determine the QStyle from the page client instead of the page's view
+        https://bugs.webkit.org/show_bug.cgi?id=34053
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::style): Implement QWebPageClient::style() and return the graphics
+        widget's style.
+        * Api/qwebpage.cpp:
+        (QWebPageWidgetClient::style): Implement QWebPageClient::style() and return the widget's style.
+
 2010-01-25  Janne Koskinen  <janne.p.koskinen@digia.com>