Changeset 182869 in webkit

Timestamp:

Apr 15, 2015 4:21:42 PM (9 years ago)

Author:

timothy_horton@apple.com

Message:

Custom CSS cursors do not use -webkit-image-set on retina displays
​https://bugs.webkit.org/show_bug.cgi?id=120783
.:

Reviewed by Beth Dakin.

Add a manual test for custom CSS cursors on retina displays.

• ManualTests/retina-cursors.html: Added.

Source/WebCore:

<rdar://problem/14921432>

Reviewed by Beth Dakin.

Scale NSCursor images correctly so custom CSS cursors work with
-webkit-image-set on retina displays.

• WebCore.exp.in:
• page/EventHandler.cpp:

(WebCore::EventHandler::selectCursor):

• platform/mac/CursorMac.mm:

(WebCore::createCustomCursor):
(WebCore::Cursor::ensurePlatformCursor):

Source/WebKit2:

Reviewed by Beth Dakin.

Serialize the cursor image scale for SetCursor messages so custom
CSS cursors work with -webkit-image-set on retina displays.

• Shared/WebCoreArgumentCoders.cpp:

(CoreIPC::ArgumentCoder<Cursor>::encode):
(CoreIPC::ArgumentCoder<Cursor>::decode):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/retina-cursors.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)
• Source/WebCore/platform/Cursor.h (modified) (1 diff)
• Source/WebCore/platform/mac/CursorMac.mm (modified) (3 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2015-04-15  Timothy Horton  <timothy_horton@apple.com>
+
+        Custom CSS cursors do not use -webkit-image-set on retina displays
+        https://bugs.webkit.org/show_bug.cgi?id=120783
+
+        Reviewed by Beth Dakin.
+        Patch by Evan Wallace <evan.exe@gmail.com>.
+
+        Add a manual test for custom CSS cursors on retina displays.
+
+        * ManualTests/retina-cursors.html: Added.
+
 2015-04-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-15  Timothy Horton  <timothy_horton@apple.com>
+
+        Custom CSS cursors do not use -webkit-image-set on retina displays
+        https://bugs.webkit.org/show_bug.cgi?id=120783
+        <rdar://problem/14921432>
+
+        Reviewed by Beth Dakin.
+        Patch by Evan Wallace <evan.exe@gmail.com>.
+
+        Scale NSCursor images correctly so custom CSS cursors work with
+        -webkit-image-set on retina displays.
+
+        * WebCore.exp.in:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::selectCursor):
+        * platform/mac/CursorMac.mm:
+        (WebCore::createCustomCursor):
+        (WebCore::Cursor::ensurePlatformCursor):
+
 2015-04-15  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1414 +1414 @@
             // Get hotspot and convert from logical pixels to physical pixels.
             IntPoint hotSpot = (*cursors)[i].hotSpot();
-            hotSpot.scale(scale, scale);
             FloatSize size = cachedImage->imageForRenderer(renderer)->size();
             if (cachedImage->errorOccurred())

trunk/Source/WebCore/platform/Cursor.h

@@ -147 +147 @@
 #if ENABLE(MOUSE_CURSOR_SCALE)
         // Hot spot is in image pixels.
-        Cursor(Image*, const IntPoint& hotSpot, float imageScaleFactor);
+        WEBCORE_EXPORT Cursor(Image*, const IntPoint& hotSpot, float imageScaleFactor);
 #endif
 

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

@@ -42 +42 @@
 // but creating a cursor with a bad image might throw.
 
+#if ENABLE(MOUSE_CURSOR_SCALE)
+static RetainPtr<NSCursor> createCustomCursor(Image* image, const IntPoint& hotSpot, float scale)
+#else
 static RetainPtr<NSCursor> createCustomCursor(Image* image, const IntPoint& hotSpot)
+#endif
 {
     // FIXME: The cursor won't animate.  Not sure if that's a big deal.
@@ -49 +53 @@
         return 0;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
+#if ENABLE(MOUSE_CURSOR_SCALE)
+    NSSize size = NSMakeSize(image->width() / scale, image->height() / scale);
+    NSSize expandedSize = NSMakeSize(ceil(size.width), ceil(size.height));
+
+    // Pad the image with transparent pixels so it has an integer boundary.
+    if (size.width != expandedSize.width || size.height != expandedSize.height) {
+        RetainPtr<NSImage> expandedImage = adoptNS([[NSImage alloc] initWithSize:expandedSize]);
+        NSRect toRect = NSMakeRect(0, expandedSize.height - size.height, size.width, size.height);
+        NSRect fromRect = NSMakeRect(0, 0, image->width(), image->height());
+
+        [expandedImage lockFocus];
+        [nsImage drawInRect:toRect fromRect:fromRect operation:NSCompositeSourceOver fraction:1];
+        [expandedImage unlockFocus];
+
+        return adoptNS([[NSCursor alloc] initWithImage:expandedImage.get() hotSpot:hotSpot]);
+    }
+
+    // Scale the image and its representation to match retina resolution.
+    [nsImage setSize:expandedSize];
+    [[[nsImage representations] objectAtIndex:0] setSize:expandedSize];
+#endif
+
     return adoptNS([[NSCursor alloc] initWithImage:nsImage hotSpot:hotSpot]);
     END_BLOCK_OBJC_EXCEPTIONS;
-    return 0;
+    return nullptr;
 }
 
@@ -206 +233 @@
 
     case Cursor::Custom:
+#if ENABLE(MOUSE_CURSOR_SCALE)
+        m_platformCursor = createCustomCursor(m_image.get(), m_hotSpot, m_imageScaleFactor);
+#else
         m_platformCursor = createCustomCursor(m_image.get(), m_hotSpot);
+#endif
         break;
     }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-15  Timothy Horton  <timothy_horton@apple.com>
+
+        Custom CSS cursors do not use -webkit-image-set on retina displays
+        https://bugs.webkit.org/show_bug.cgi?id=120783
+
+        Reviewed by Beth Dakin.
+        Patch by Evan Wallace <evan.exe@gmail.com>.
+
+        Serialize the cursor image scale for SetCursor messages so custom
+        CSS cursors work with -webkit-image-set on retina displays.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (CoreIPC::ArgumentCoder<Cursor>::encode):
+        (CoreIPC::ArgumentCoder<Cursor>::decode):
+
 2015-04-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -767 +767 @@
     encodeImage(encoder, cursor.image());
     encoder << cursor.hotSpot();
+#if ENABLE(MOUSE_CURSOR_SCALE)
+    encoder << cursor.imageScaleFactor();
+#endif
 }
 
@@ -808 +811 @@
         return false;
 
+#if ENABLE(MOUSE_CURSOR_SCALE)
+    float scale;
+    if (!decoder.decode(scale))
+        return false;
+
+    cursor = Cursor(image.get(), hotSpot, scale);
+#else
     cursor = Cursor(image.get(), hotSpot);
+#endif
     return true;
 }