Title: [95057] trunk/Source/WebCore
- Revision
- 95057
- Author
- [email protected]
- Date
- 2011-09-13 17:05:13 -0700 (Tue, 13 Sep 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95056 => 95057)
--- trunk/Source/WebCore/ChangeLog 2011-09-13 23:32:36 UTC (rev 95056)
+++ trunk/Source/WebCore/ChangeLog 2011-09-14 00:05:13 UTC (rev 95057)
@@ -1,3 +1,17 @@
+2011-09-13 Jeff Miller <[email protected]>
+
+ 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 <[email protected]>
MSAA: WebKit reports the document state as disabled
Modified: trunk/Source/WebCore/platform/win/CursorWin.cpp (95056 => 95057)
--- trunk/Source/WebCore/platform/win/CursorWin.cpp 2011-09-13 23:32:36 UTC (rev 95056)
+++ trunk/Source/WebCore/platform/win/CursorWin.cpp 2011-09-14 00:05:13 UTC (rev 95057)
@@ -243,7 +243,6 @@
m_platformCursor = loadSharedCursor(0, IDC_APPSTARTING);
break;
case Cursor::NoDrop:
- break;
case Cursor::NotAllowed:
m_platformCursor = loadSharedCursor(0, IDC_NO);
break;
@@ -256,6 +255,10 @@
case Cursor::Custom:
m_platformCursor = createSharedCursor(m_image.get(), m_hotSpot);
break;
+ default:
+ ASSERT_NOT_REACHED();
+ m_platformCursor = loadSharedCursor(0, IDC_ARROW);
+ break;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
