Changeset 95057 in webkit

Timestamp:

Sep 13, 2011 5:05:13 PM (13 years ago)

Author:

jeffm@apple.com

Message:

WebCore::Cursor::ensurePlatformCursor() should always set a valid platform cursor on Windows
​https://bugs.webkit.org/show_bug.cgi?id=68043

Make sure we set a valid platform cursor in the Cursor::NoDrop case, and add a default
clause that uses the arrow cursor in case another cursor type is added in the future
and we forget to update ensurePlatformCursor().

Reviewed by Anders Carlsson.

• platform/win/CursorWin.cpp:

(WebCore::Cursor::ensurePlatformCursor): Always set a valid platform cursor.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/CursorWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-13  Jeff Miller  <jeffm@apple.com>
+
+        WebCore::Cursor::ensurePlatformCursor() should always set a valid platform cursor on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=68043
+        
+        Make sure we set a valid platform cursor in the Cursor::NoDrop case, and add a default
+        clause that uses the arrow cursor in case another cursor type is added in the future
+        and we forget to update ensurePlatformCursor().
+
+        Reviewed by Anders Carlsson.
+
+        * platform/win/CursorWin.cpp:
+        (WebCore::Cursor::ensurePlatformCursor): Always set a valid platform cursor.
+
 2011-09-12  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/WebCore/platform/win/CursorWin.cpp

@@ -244 +244 @@
         break;
     case Cursor::NoDrop:
-        break;
     case Cursor::NotAllowed:
         m_platformCursor = loadSharedCursor(0, IDC_NO);
@@ -256 +255 @@
     case Cursor::Custom:
         m_platformCursor = createSharedCursor(m_image.get(), m_hotSpot);
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+        m_platformCursor = loadSharedCursor(0, IDC_ARROW);
         break;
     }