Title: [95211] branches/safari-534.51-branch/Source/WebCore
- Revision
- 95211
- Author
- mr...@apple.com
- Date
- 2011-09-15 12:20:00 -0700 (Thu, 15 Sep 2011)
Log Message
Merge r95057.
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (95210 => 95211)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-09-15 19:18:13 UTC (rev 95210)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-09-15 19:20:00 UTC (rev 95211)
@@ -1,5 +1,23 @@
2011-09-15 Mark Rowe <mr...@apple.com>
+ Merge r95057.
+
+ 2011-09-13 Jeff Miller <je...@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-15 Mark Rowe <mr...@apple.com>
+
Merge r95056.
2011-09-12 Jon Honeycutt <jhoneyc...@apple.com>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/win/CursorWin.cpp (95210 => 95211)
--- branches/safari-534.51-branch/Source/WebCore/platform/win/CursorWin.cpp 2011-09-15 19:18:13 UTC (rev 95210)
+++ branches/safari-534.51-branch/Source/WebCore/platform/win/CursorWin.cpp 2011-09-15 19:20:00 UTC (rev 95211)
@@ -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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
