[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3b1fbe066353ecb7ae2cb562aeae1db9e1f1dd2b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 12 23:20:33 2009 +0000

    2009-10-12  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            Add a palette() method that is needed by our RenderTheme.
    
            * platform/qt/QWebPageClient.h:
    2009-10-12  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            Implement the new palette() methods on the page clients
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::palette):
            * Api/qwebview.cpp:
            (QWebViewPrivate::palette):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf5e0ef..e78a5ec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-12  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Add a palette() method that is needed by our RenderTheme.
+
+        * platform/qt/QWebPageClient.h:
+
 2009-10-12  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h
index 6cf0067..2a285c5 100644
--- a/WebCore/platform/qt/QWebPageClient.h
+++ b/WebCore/platform/qt/QWebPageClient.h
@@ -55,6 +55,7 @@ public:
 #endif
     }
 
+    virtual QPalette palette() const = 0;
     virtual int screenNumber() const = 0;
     virtual WId winId() const = 0;
 
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 19f693b..aa38dcd 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -54,6 +54,7 @@ public:
     virtual void updateCursor(const QCursor& cursor);
 #endif
 
+    virtual QPalette palette() const;
     virtual int screenNumber() const;
     virtual WId winId() const;
 
@@ -126,6 +127,11 @@ void QGraphicsWebViewPrivate::updateCursor(const QCursor& cursor)
 }
 #endif
 
+QPalette QGraphicsWebViewPrivate::palette() const
+{
+    return q->palette();
+}
+
 int QGraphicsWebViewPrivate::screenNumber() const
 {
 #if defined(Q_WS_X11)
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 330463a..b431c00 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -57,6 +57,7 @@ public:
     virtual void updateCursor(const QCursor& cursor);
 #endif
 
+    virtual QPalette palette() const;
     virtual int screenNumber() const;
     virtual WId winId() const;
 
@@ -105,6 +106,11 @@ void QWebViewPrivate::updateCursor(const QCursor& cursor)
 }
 #endif
 
+QPalette QWebViewPrivate::palette() const
+{
+    return view->palette();
+}
+
 int QWebViewPrivate::screenNumber() const
 {
 #if defined(Q_WS_X11)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 6137f5f..9979a52 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-12  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Implement the new palette() methods on the page clients
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::palette):
+        * Api/qwebview.cpp:
+        (QWebViewPrivate::palette):
+
 2009-10-12  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging