Changeset 96777 in webkit

Timestamp:

Oct 5, 2011, 5:56:43 PM (14 years ago)

Author:

Darin Adler

Message:

[Mac] Use four more named cursors if present
​https://bugs.webkit.org/show_bug.cgi?id=69488

Reviewed by Dan Bernstein.

• platform/mac/CursorMac.mm:

(WebCore::Cursor::ensurePlatformCursor): Use the names "Help", "Cell",
"ZoomIn", and "ZoomOut" to get those cursors. Structure the code so it
falls back if the cursors are not present.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/CursorMac.mm (modified) (23 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-05  Darin Adler  <darin@apple.com>
+
+        [Mac] Use four more named cursors if present
+        https://bugs.webkit.org/show_bug.cgi?id=69488
+
+        Reviewed by Dan Bernstein.
+
+        * platform/mac/CursorMac.mm:
+        (WebCore::Cursor::ensurePlatformCursor): Use the names "Help", "Cell",
+        "ZoomIn", and "ZoomOut" to get those cursors. Structure the code so it
+        falls back if the cursors are not present.
+
 2011-10-05  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/platform/mac/CursorMac.mm

@@ -80 +80 @@
         m_platformCursor = [NSCursor arrowCursor];
         break;
+
     case Cursor::Cross:
         m_platformCursor = [NSCursor crosshairCursor];
         break;
+
     case Cursor::Hand:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -88 +90 @@
 #else
         // The pointingHandCursor from NSCursor does not have a shadow on
-        // older versions of Mac OS X, so use our own custom cursor.
+        // older versions of OS X, so use our own custom cursor.
         m_platformCursor = createNamedCursor("linkCursor", 6, 1);
 #endif
         break;
+
     case Cursor::IBeam:
         m_platformCursor = [NSCursor IBeamCursor];
         break;
+
     case Cursor::Wait:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -102 +106 @@
 #endif
         break;
+
     case Cursor::Help:
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        m_platformCursor = wkCursor("Help");
+        if (m_platformCursor)
+            break;
+#endif
         m_platformCursor = createNamedCursor("helpCursor", 8, 8);
         break;
+
     case Cursor::Move:
     case Cursor::MiddlePanning:
@@ -113 +124 @@
 #endif
         break;
+
     case Cursor::EastResize:
     case Cursor::EastPanning:
@@ -121 +133 @@
 #endif
         break;
+
     case Cursor::NorthResize:
     case Cursor::NorthPanning:
@@ -129 +142 @@
 #endif
         break;
+
     case Cursor::NorthEastResize:
     case Cursor::NorthEastPanning:
@@ -137 +151 @@
 #endif
         break;
+
     case Cursor::NorthWestResize:
     case Cursor::NorthWestPanning:
@@ -145 +160 @@
 #endif
         break;
+
     case Cursor::SouthResize:
     case Cursor::SouthPanning:
@@ -153 +169 @@
 #endif
         break;
+
     case Cursor::SouthEastResize:
     case Cursor::SouthEastPanning:
@@ -161 +178 @@
 #endif
         break;
+
     case Cursor::SouthWestResize:
     case Cursor::SouthWestPanning:
@@ -169 +187 @@
 #endif
         break;
+
     case Cursor::WestResize:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -176 +195 @@
 #endif
         break;
+
     case Cursor::NorthSouthResize:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -183 +203 @@
 #endif
         break;
+
     case Cursor::EastWestResize:
     case Cursor::WestPanning:
@@ -191 +212 @@
 #endif
         break;
+
     case Cursor::NorthEastSouthWestResize:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -198 +220 @@
 #endif
         break;
+
     case Cursor::NorthWestSouthEastResize:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -205 +228 @@
 #endif
         break;
+
     case Cursor::ColumnResize:
         m_platformCursor = [NSCursor resizeLeftRightCursor];
         break;
+
     case Cursor::RowResize:
         m_platformCursor = [NSCursor resizeUpDownCursor];
         break;
+
     case Cursor::VerticalText:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -218 +244 @@
 #endif
         break;
+
     case Cursor::Cell:
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        m_platformCursor = wkCursor("Cell");
+        if (m_platformCursor)
+            break;
+#endif
         m_platformCursor = createNamedCursor("cellCursor", 7, 7);
         break;
+
     case Cursor::ContextMenu:
 #if !defined(BUILDING_ON_LEOPARD)
@@ -228 +261 @@
 #endif
         break;
+
     case Cursor::Alias:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -235 +269 @@
 #endif
         break;
+
     case Cursor::Progress:
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -242 +277 @@
 #endif
         break;
+
     case Cursor::NoDrop:
 #if !defined(BUILDING_ON_LEOPARD)
@@ -249 +285 @@
 #endif
         break;
+
     case Cursor::Copy:
 #if !defined(BUILDING_ON_LEOPARD)
@@ -256 +293 @@
 #endif
         break;
+
     case Cursor::None:
         m_platformCursor = createNamedCursor("noneCursor", 7, 7);
         break;
+
     case Cursor::NotAllowed:
 #if !defined(BUILDING_ON_LEOPARD)
@@ -266 +305 @@
 #endif
         break;
+
     case Cursor::ZoomIn:
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        m_platformCursor = wkCursor("ZoomIn");
+        if (m_platformCursor)
+            break;
+#endif
         m_platformCursor = createNamedCursor("zoomInCursor", 7, 7);
         break;
+
     case Cursor::ZoomOut:
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+        m_platformCursor = wkCursor("ZoomOut");
+        if (m_platformCursor)
+            break;
+#endif
         m_platformCursor = createNamedCursor("zoomOutCursor", 7, 7);
         break;
+
     case Cursor::Grab:
         m_platformCursor = [NSCursor openHandCursor];
         break;
+
     case Cursor::Grabbing:
         m_platformCursor = [NSCursor closedHandCursor];
         break;
+
     case Cursor::Custom:
         m_platformCursor = createCustomCursor(m_image.get(), m_hotSpot);