Title: [92919] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92918 => 92919)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 04:57:45 UTC (rev 92918)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 05:10:23 UTC (rev 92919)
@@ -1,5 +1,23 @@
2011-08-11 Lucas Forschler <[email protected]>
+ Merged 91040
+
+ 2011-07-14 Darin Adler <[email protected]>
+
+ [Mac] Use [NSCursor operationNotAllowedCursor] for CSS no-drop as well as CSS not-allowed
+ https://bugs.webkit.org/show_bug.cgi?id=64570
+
+ Reviewed by Alexey Proskuryakov.
+
+ Mac OS X documentation and usage makes it clear that this cursor is usually used for no-drop,
+ and that it's also reasonable to use it for not-allowed.
+
+ * platform/mac/CursorMac.mm:
+ (WebCore::Cursor::ensurePlatformCursor): Use [NSCursor operationNotAllowedCursor] for
+ Cursor::NoDrop.
+
+2011-08-11 Lucas Forschler <[email protected]>
+
Merged 90595
2011-07-07 Gavin Peters <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm (92918 => 92919)
--- branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm 2011-08-12 04:57:45 UTC (rev 92918)
+++ branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm 2011-08-12 05:10:23 UTC (rev 92919)
@@ -238,7 +238,11 @@
#endif
break;
case Cursor::NoDrop:
+#if !defined(BUILDING_ON_LEOPARD)
+ m_platformCursor = [NSCursor operationNotAllowedCursor];
+#else
m_platformCursor = createNamedCursor("noDropCursor", 3, 1);
+#endif
break;
case Cursor::Copy:
#if !defined(BUILDING_ON_LEOPARD)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
