Title: [94210] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (94209 => 94210)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-31 18:46:14 UTC (rev 94209)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-31 18:48:14 UTC (rev 94210)
@@ -1,5 +1,19 @@
2011-08-29 Lucas Forschler <[email protected]>
+ Merged 93900
+
+ 2011-08-26 Darin Adler <[email protected]>
+
+ [Mac] Use the progress cursor instead of the wristwatch for CSS "wait" cursor
+ https://bugs.webkit.org/show_bug.cgi?id=67049
+
+ Reviewed by Beth Dakin.
+
+ * platform/mac/CursorMac.mm:
+ (WebCore::Cursor::ensurePlatformCursor): Use BusyButClickable cursor for wait
+ as well as for Progress.
+2011-08-29 Lucas Forschler <[email protected]>
+
Merged 93878
2011-08-26 Eric Carlson <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm (94209 => 94210)
--- branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm 2011-08-31 18:46:14 UTC (rev 94209)
+++ branches/safari-534.51-branch/Source/WebCore/platform/mac/CursorMac.mm 2011-08-31 18:48:14 UTC (rev 94210)
@@ -95,7 +95,11 @@
m_platformCursor = [NSCursor IBeamCursor];
break;
case Cursor::Wait:
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+ m_platformCursor = wkCursor("BusyButClickable");
+#else
m_platformCursor = createNamedCursor("waitCursor", 7, 7);
+#endif
break;
case Cursor::Help:
m_platformCursor = createNamedCursor("helpCursor", 8, 8);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
