Changeset 48154 in webkit

Timestamp:

Sep 8, 2009 7:43:08 AM (15 years ago)

Author:

Simon Hausmann

Message:

WebCore: [Qt] Make cursor set cleaner in QtWebKit Api: eliminate SetCursorEvent hack.
​https://bugs.webkit.org/show_bug.cgi?id=28865

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org> on 2009-09-08
Reviewed by Simon Hausmann.

Save the QCursor as a property in WidgetQt::setCursor
and actually change the cursor in QWebView::event() by making use
of the QEvent::DynamicPropertyChange event type.
When unsetCursor() is called on the QWidget we can fallback to
the cursor set by WebCore.

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org> and

Antonio Gomes <​antonio.gomes@openbossa.org> on 2009-09-07

• platform/qt/WidgetQt.cpp:

(WebCore::Widget::setCursor):

WebKit/qt: [Qt] Make cursor set cleaner in QtWebKit Api: eliminate SetCursorEvent hack.
​https://bugs.webkit.org/show_bug.cgi?id=28865

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org> on 2009-09-08
Reviewed by Simon Hausmann.

Clean up the unserCursor hack to use the QCursor set
as a property of the QWidget by WebCore::WidgetQt.

Remove all code that are no longer necessary for getting
cursor change events.

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org> and

Antonio Gomes <​antonio.gomes@openbossa.org> on 2009-09-07

• Api/qwebpage.cpp:
• Api/qwebpage_p.h:
• Api/qwebview.cpp:

(QWebViewPrivate::QWebViewPrivate):
(QWebView::event):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/WidgetQt.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage_p.h (modified) (1 diff)
• WebKit/qt/Api/qwebview.cpp (modified) (3 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-08  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make cursor set cleaner in QtWebKit Api: eliminate SetCursorEvent hack.
+        https://bugs.webkit.org/show_bug.cgi?id=28865
+
+        Save the QCursor as a property in WidgetQt::setCursor
+        and actually change the cursor in QWebView::event() by making use
+        of the QEvent::DynamicPropertyChange event type.
+        When unsetCursor() is called on the QWidget we can fallback to
+        the cursor set by WebCore.
+
+        Patch by Kenneth Rohde Christiansen <kenneth@webkit.org> and
+                 Antonio Gomes <antonio.gomes@openbossa.org> on 2009-09-07
+
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::Widget::setCursor):
+
 2009-09-08  Andras Becsi  <becsi.andras@stud.u-szeged.hu>
 

trunk/WebCore/platform/qt/WidgetQt.cpp

@@ -90 +90 @@
         return;
 
-    QCoreApplication::postEvent(widget, new SetCursorEvent(cursor.impl()));
+    widget->setProperty("WebCoreCursor", cursor.impl());
 #endif
 }

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -225 +225 @@
     return 0;
 }
-
-#ifndef QT_NO_CURSOR
-SetCursorEvent::SetCursorEvent(const QCursor& cursor)
-    : QEvent(static_cast<QEvent::Type>(EventType))
-    , m_cursor(cursor)
-{}
-
-QCursor SetCursorEvent::cursor() const
-{
-    return m_cursor;
-}
-#endif
 
 // If you change this make sure to also adjust the docs for QWebPage::userAgentForUrl

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -46 +46 @@
     class Page;
     class Frame;
-
-#ifndef QT_NO_CURSOR
-    class SetCursorEvent : public QEvent {
-    public:
-        static const int EventType = 724;
-        SetCursorEvent(const QCursor&);
-
-        QCursor cursor() const;
-    private:
-        QCursor m_cursor;
-    };
-#endif
 }
 

trunk/WebKit/qt/Api/qwebview.cpp

@@ -37 +37 @@
         , page(0)
         , renderHints(QPainter::TextAntialiasing)
-#ifndef QT_NO_CURSOR
-        , cursorSetByWebCore(false)
-        , usesWebCoreCursor(true)
-#endif
     {}
 
@@ -49 +45 @@
 
     QPainter::RenderHints renderHints;
-
-#ifndef QT_NO_CURSOR
-    /*
-     * We keep track of if we have called setCursor and if the CursorChange
-     * event is sent due our setCursor call and if we currently use the WebCore
-     * Cursor and use it to decide if we can update to another WebCore Cursor.
-     */
-    bool cursorSetByWebCore;
-    bool usesWebCoreCursor;
-
-    void setCursor(const QCursor& newCursor)
-    {
-        webCoreCursor = newCursor;
-
-        if (usesWebCoreCursor) {
-            cursorSetByWebCore = true;
-            view->setCursor(webCoreCursor);
-        }
-    }
-
-    QCursor webCoreCursor;
-#endif
 };
 
@@ -705 +679 @@
             d->page->event(e);
 #ifndef QT_NO_CURSOR
-        } else if (e->type() == static_cast<QEvent::Type>(WebCore::SetCursorEvent::EventType)) {
-            d->setCursor(static_cast<WebCore::SetCursorEvent*>(e)->cursor());
 #if QT_VERSION >= 0x040400
         } else if (e->type() == QEvent::CursorChange) {
-            // Okay we might use the WebCore Cursor now.
-            d->usesWebCoreCursor = d->cursorSetByWebCore;
-            d->cursorSetByWebCore = false;
-
-            // Go back to the WebCore Cursor. QWidget::unsetCursor is appromixated with this
-            if (!d->usesWebCoreCursor && cursor().shape() == Qt::ArrowCursor) {
-                d->usesWebCoreCursor = true;
-                d->setCursor(d->webCoreCursor);
+            // might be a QWidget::unsetCursor()
+            if (cursor().shape() == Qt::ArrowCursor) {
+                QVariant prop = property("WebCoreCursor");
+                if (prop.isValid()) {
+                    QCursor webCoreCursor = qvariant_cast<QCursor>(prop);
+                    if (webCoreCursor.shape() != Qt::ArrowCursor)
+                        setCursor(webCoreCursor);
+                }
+            }
+        } else if (e->type() == QEvent::DynamicPropertyChange) {
+            const QByteArray& propName = static_cast<QDynamicPropertyChangeEvent *>(e)->propertyName();
+            if (!qstrcmp(propName, "WebCoreCursor")) {
+                QVariant prop = property("WebCoreCursor");
+                if (prop.isValid()) {
+                    QCursor webCoreCursor = qvariant_cast<QCursor>(prop);
+                    setCursor(webCoreCursor);
+                }
             }
 #endif

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-09-08  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make cursor set cleaner in QtWebKit Api: eliminate SetCursorEvent hack.
+        https://bugs.webkit.org/show_bug.cgi?id=28865
+
+        Clean up the unserCursor hack to use the QCursor set
+        as a property of the QWidget by WebCore::WidgetQt.
+
+        Remove all code that are no longer necessary for getting
+        cursor change events.
+
+        Patch by Kenneth Rohde Christiansen <kenneth@webkit.org> and
+                 Antonio Gomes <antonio.gomes@openbossa.org> on 2009-09-07
+
+        * Api/qwebpage.cpp:
+        * Api/qwebpage_p.h:
+        * Api/qwebview.cpp:
+        (QWebViewPrivate::QWebViewPrivate):
+        (QWebView::event):
+
 2009-09-08  Laszlo Gombos  <laszlo.1.gombos@nokia.com>