Changeset 57887 in webkit

Timestamp:

Apr 20, 2010 6:23:10 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-20 Stuart Morgan <​stuartmorgan@chromium.org>

Reviewed by David Levin.

Remove a workaround in plugin cursor setting that was obsoleted by
the change in ​https://bugs.webkit.org/show_bug.cgi?id=35132
​https://bugs.webkit.org/show_bug.cgi?id=37811

• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::ChromeClientImpl): (WebKit::ChromeClientImpl::setCursor): (WebKit::ChromeClientImpl::setCursorForPlugin):
• src/ChromeClientImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/ChromeClientImpl.cpp (modified) (3 diffs)
• src/ChromeClientImpl.h (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-20  Stuart Morgan  <stuartmorgan@chromium.org>
+
+        Reviewed by David Levin.
+
+        Remove a workaround in plugin cursor setting that was obsoleted by
+        the change in https://bugs.webkit.org/show_bug.cgi?id=35132
+        https://bugs.webkit.org/show_bug.cgi?id=37811
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::ChromeClientImpl):
+        (WebKit::ChromeClientImpl::setCursor):
+        (WebKit::ChromeClientImpl::setCursorForPlugin):
+        * src/ChromeClientImpl.h:
+
 2010-04-19  Ada Chan  <adachan@apple.com>
 

trunk/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -103 +103 @@
     , m_menubarVisible(true)
     , m_resizable(true)
-    , m_ignoreNextSetCursor(false)
 {
 }
@@ -643 +642 @@
 void ChromeClientImpl::setCursor(const WebCursorInfo& cursor)
 {
-    if (m_ignoreNextSetCursor) {
-        m_ignoreNextSetCursor = false;
-        return;
-    }
-
     if (m_webView->client())
         m_webView->client()->didChangeCursor(cursor);
@@ -655 +649 @@
 {
     setCursor(cursor);
-
-    // Currently, Widget::setCursor is always called after this function in
-    // EventHandler.cpp and since we don't want that we set a flag indicating
-    // that the next SetCursor call is to be ignored.
-    m_ignoreNextSetCursor = true;
 }
 

trunk/WebKit/chromium/src/ChromeClientImpl.h

@@ -166 +166 @@
     bool m_menubarVisible;
     bool m_resizable;
-    // Set to true if the next SetCursor is to be ignored.
-    bool m_ignoreNextSetCursor;
 };