Changeset 41055 in webkit

Timestamp:

Feb 18, 2009 4:17:11 AM (15 years ago)

Author:

kov@webkit.org

Message:

2009-02-18 Xan Lopez <​xan@gnome.org>

Reviewed by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=23989

Based on a patch by Bo Yang <​techrazy.yang@gmail.com>

Make the cursor cache global, that's all we really need and
otherwise we can miss cursor transitions in some situations (see
the bug for one testcase). Also remove some now useless code.

• platform/Widget.h:
• platform/gtk/WidgetGtk.cpp: (WebCore::Widget::Widget): (WebCore::Widget::~Widget): (WebCore::Widget::setCursor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Widget.h (modified) (2 diffs)
• platform/gtk/WidgetGtk.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-18  Xan Lopez  <xan@gnome.org>
+
+        Reviewed by Mark Rowe.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23989
+
+        Based on a patch by Bo Yang  <techrazy.yang@gmail.com>
+
+        Make the cursor cache global, that's all we really need and
+        otherwise we can miss cursor transitions in some situations (see
+        the bug for one testcase). Also remove some now useless code.
+
+        * platform/Widget.h:
+        * platform/gtk/WidgetGtk.cpp:
+        (WebCore::Widget::Widget):
+        (WebCore::Widget::~Widget):
+        (WebCore::Widget::setCursor):
+
 2009-02-17  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/Widget.h

@@ -138 +138 @@
 
     void setCursor(const Cursor&);
-    Cursor cursor();
 
     virtual void show();
@@ -194 +193 @@
     IntRect m_frame; // Not used when a native widget exists.
 
-#if PLATFORM(MAC) || PLATFORM(GTK)
+#if PLATFORM(MAC)
     WidgetPrivate* m_data;
 #endif

trunk/WebCore/platform/gtk/WidgetGtk.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-class WidgetPrivate {
-public:
-    GdkCursor* cursor;
-};
+static GdkCursor* lastSetCursor;
 
 Widget::Widget(PlatformWidget widget)
-    : m_data(new WidgetPrivate)
 {
     init(widget);
-    m_data->cursor = 0;
 }
 
@@ -58 +53 @@
     ASSERT(!parent());
     releasePlatformWidget();
-    delete m_data;
 }
 
@@ -64 +58 @@
 {
     gtk_widget_grab_focus(platformWidget() ? platformWidget() : GTK_WIDGET(root()->hostWindow()->platformWindow()));
-}
-
-Cursor Widget::cursor()
-{
-    return Cursor(m_data->cursor);
 }
 
@@ -78 +67 @@
 void Widget::setCursor(const Cursor& cursor)
 {
-    GdkCursor* pcur = cursor.impl();
+    GdkCursor* platformCursor = cursor.impl();
 
     // http://bugs.webkit.org/show_bug.cgi?id=16388
@@ -86 +75 @@
     // expensive operation, so avoid it if possible.
 
-    if (pcur == m_data->cursor)
+    if (platformCursor == lastSetCursor)
         return;
 
-    gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : GTK_WIDGET(root()->hostWindow()->platformWindow())->window, pcur);
-    m_data->cursor = pcur;
+    gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : GTK_WIDGET(root()->hostWindow()->platformWindow())->window, platformCursor);
+    lastSetCursor = platformCursor;
 }