Title: [93457] branches/safari-534.51-branch/Source/WebCore
- Revision
- 93457
- Author
- [email protected]
- Date
- 2011-08-19 16:59:10 -0700 (Fri, 19 Aug 2011)
Log Message
Fix for mis-merge. Radar 9750868
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (93456 => 93457)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-19 23:56:34 UTC (rev 93456)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-19 23:59:10 UTC (rev 93457)
@@ -1,5 +1,10 @@
2011-08-18 Lucas Forschler <[email protected]>
+ <rdar://problem/9750868>
+ Manual fix of previous merge mistake.
+
+2011-08-18 Lucas Forschler <[email protected]>
+
Merged 91998
2011-07-29 Anders Carlsson <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm (93456 => 93457)
--- branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm 2011-08-19 23:56:34 UTC (rev 93456)
+++ branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm 2011-08-19 23:59:10 UTC (rev 93457)
@@ -255,7 +255,7 @@
m_platformCursor = createNamedCursor("noneCursor", 7, 7);
break;
case Cursor::NotAllowed:
- m_platformCursor = createNamedCursor("notAllowedCursor", 11, 11);
+ m_platformCursor = [NSCursor operationNotAllowedCursor];
break;
case Cursor::ZoomIn:
m_platformCursor = createNamedCursor("zoomInCursor", 7, 7);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
