[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bd293bf80bc34f6baf043b8585ac007c74ccd70b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 20 02:51:57 2010 +0000

    2010-08-19  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix cursor change propagation
            https://bugs.webkit.org/show_bug.cgi?id=44250
    
            No functional change so new tests.
    
            Propagate the setCursor callback to the PageClient via the HostWindow instead of preassuming
            the concrete type of the ChromeClient (what was generally wrong and actually incompatible with WebKit2).
            * platform/qt/WidgetQt.cpp:
            (WebCore::Widget::setCursor):
    2010-08-19  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix cursor change propagation
            https://bugs.webkit.org/show_bug.cgi?id=44250
    
            * WebCoreSupport/ChromeClientQt.cpp:
            (WebCore::ChromeClientQt::setCursor): Implemented. Propagete the callback forward to the PageClient.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2b8c34..8c05ea4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-19  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix cursor change propagation
+        https://bugs.webkit.org/show_bug.cgi?id=44250
+
+        No functional change so new tests.
+
+        Propagate the setCursor callback to the PageClient via the HostWindow instead of preassuming
+        the concrete type of the ChromeClient (what was generally wrong and actually incompatible with WebKit2).
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::Widget::setCursor):
+
 2010-08-19  Vangelis Kokkevis  <vangelis at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/qt/WidgetQt.cpp b/WebCore/platform/qt/WidgetQt.cpp
index cda969f..e64d655 100644
--- a/WebCore/platform/qt/WidgetQt.cpp
+++ b/WebCore/platform/qt/WidgetQt.cpp
@@ -78,10 +78,10 @@ void Widget::setFocus(bool focused)
 void Widget::setCursor(const Cursor& cursor)
 {
 #ifndef QT_NO_CURSOR
-    QWebPageClient* pageClient = root()->hostWindow()->platformPageClient();
-
-    if (pageClient)
-        pageClient->setCursor(*cursor.platformCursor());
+    ScrollView* view = root();
+    if (!view)
+        return;
+    view->hostWindow()->setCursor(cursor);
 #endif
 }
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 498486b..92428df 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-19  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix cursor change propagation
+        https://bugs.webkit.org/show_bug.cgi?id=44250
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::setCursor): Implemented. Propagete the callback forward to the PageClient.
+
 2010-08-19  David Kilzer  <ddkilzer at apple.com>
 
         BUILD FIX #3: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 87ed19d..bfce824 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -554,9 +554,16 @@ void ChromeClientQt::chooseIconForFiles(const Vector<String>& filenames, FileCho
     chooser->iconLoaded(Icon::createIconForFiles(filenames));
 }
 
-void ChromeClientQt::setCursor(const Cursor&)
+void ChromeClientQt::setCursor(const Cursor& cursor)
 {
-    notImplemented();
+#ifndef QT_NO_CURSOR
+    QWebPageClient* pageClient = platformPageClient();
+    if (!pageClient)
+        return;
+    pageClient->setCursor(*cursor.platformCursor());
+#else
+    UNUSED_PARAM(cursor)
+#endif
 }
 
 void ChromeClientQt::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)

-- 
WebKit Debian packaging