[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a4f3318c1b627c1ebedd24e8653950e624c22905
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 25 14:42:28 2010 +0000

    2010-01-25  Simon Hausmann  <hausmann at 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 at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9b5a05a..a45713b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-01-25  Simon Hausmann  <hausmann at 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 at webkit.org>
+
         Reviewed by Kenneth Christiansen.
 
         [Qt] Clean up code to determine palette from page client in RenderThemeQt
diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h
index 09fe768..6d47c29 100644
--- a/WebCore/platform/qt/QWebPageClient.h
+++ b/WebCore/platform/qt/QWebPageClient.h
@@ -31,7 +31,11 @@
 #endif
 
 #include <QRect>
+
+QT_BEGIN_NAMESPACE
 class QGraphicsItem;
+class QStyle;
+QT_END_NAMESPACE
 
 class QWebPageClient {
 public:
@@ -79,6 +83,8 @@ public:
 
     virtual QObject* pluginParent() const = 0;
 
+    virtual QStyle* style() const = 0;
+
 protected:
 #ifndef QT_NO_CURSOR
     virtual QCursor cursor() const = 0;
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 0cc8d7c..21d801e 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -160,13 +160,10 @@ QStyle* RenderThemeQt::fallbackStyle()
 QStyle* RenderThemeQt::qStyle() const
 {
     if (m_page) {
-        ChromeClientQt* client = static_cast<ChromeClientQt*>(m_page->chrome()->client());
+        QWebPageClient* pageClient = m_page->chrome()->client()->platformPageClient();
 
-        if (!client->m_webPage)
-            return QApplication::style();
-
-        if (QWidget* view = client->m_webPage->view())
-            return view->style();
+        if (pageClient)
+            return pageClient->style();
     }
 
     return QApplication::style();
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index d9e8a74..8d4f3ba 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -108,6 +108,8 @@ public:
 
     virtual QObject* pluginParent() const;
 
+    virtual QStyle* style() const;
+
 #if USE(ACCELERATED_COMPOSITING)
     virtual void setRootGraphicsLayer(QGraphicsItem* layer);
     virtual void markForSync(bool scheduleSync);
@@ -291,6 +293,11 @@ QObject* QGraphicsWebViewPrivate::pluginParent() const
     return q;
 }
 
+QStyle* QGraphicsWebViewPrivate::style() const
+{
+    return q->style();
+}
+
 /*!
     \class QGraphicsWebView
     \brief The QGraphicsWebView class allows Web content to be added to a GraphicsView.
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 598d7d6..e50943c 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -172,6 +172,8 @@ public:
 
     virtual QObject* pluginParent() const;
 
+    virtual QStyle* style() const;
+
     QWidget* view;
 };
 
@@ -241,6 +243,11 @@ QObject* QWebPageWidgetClient::pluginParent() const
     return view;
 }
 
+QStyle* QWebPageWidgetClient::style() const
+{
+    return view->style();
+}
+
 // Lookup table mapping QWebPage::WebActions to the associated Editor commands
 static const char* editorCommandWebActions[] =
 {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1d9403e..0c93ee1 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-25  Simon Hausmann  <hausmann at 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 at digia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging