[Mac] Modernize image for dragged link
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 May 2017 02:07:22 +0000 (02:07 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 May 2017 02:07:22 +0000 (02:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=171701
<rdar://problem/31978818>

Reviewed by Simon Fraser.

* WebCore.xcodeproj/project.pbxproj:
* page/mac/DragControllerMac.mm:
* platform/mac/DragImageMac.mm:
(WebCore::dragImageSize):
(WebCore::scaleDragImage):
(WebCore::dissolveDragImageToFraction):
(WebCore::createDragImageFromImage):
(WebCore::LinkImageLayout::LinkImageLayout):
(WebCore::LinkImageLayout::layOutText):
(WebCore::LinkImageLayout::addLine):
(WebCore::createDragImageForLink):
(WebCore::fontFromNSFont): Deleted.
(WebCore::canUseFastRenderer): Deleted.
(WebCore::widthWithFont): Deleted.
(WebCore::drawAtPoint): Deleted.
(WebCore::drawDoubledAtPoint): Deleted.
* platform/spi/cocoa/LinkPresentationSPI.h: Added.
Improve the design of URL drag images.
The margins are increased, the background is now white, the text is
not drawn doubled-up, the title will now wrap to two lines, and the
domain name will appear simplified and de-punycoded.

Much of the implementation of text painting is borrowed from
<attachment> for now, but we should figure out how to generalize
it for UI-like parts of WebKit in the future.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@216226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/page/mac/DragControllerMac.mm
Source/WebCore/platform/mac/DragImageMac.mm
Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h [new file with mode: 0644]

index d26be0b..9c274f4 100644 (file)
@@ -1,3 +1,37 @@
+2017-05-04  Tim Horton  <timothy_horton@apple.com>
+
+        [Mac] Modernize image for dragged link
+        https://bugs.webkit.org/show_bug.cgi?id=171701
+        <rdar://problem/31978818>
+
+        Reviewed by Simon Fraser.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * page/mac/DragControllerMac.mm:
+        * platform/mac/DragImageMac.mm:
+        (WebCore::dragImageSize):
+        (WebCore::scaleDragImage):
+        (WebCore::dissolveDragImageToFraction):
+        (WebCore::createDragImageFromImage):
+        (WebCore::LinkImageLayout::LinkImageLayout):
+        (WebCore::LinkImageLayout::layOutText):
+        (WebCore::LinkImageLayout::addLine):
+        (WebCore::createDragImageForLink):
+        (WebCore::fontFromNSFont): Deleted.
+        (WebCore::canUseFastRenderer): Deleted.
+        (WebCore::widthWithFont): Deleted.
+        (WebCore::drawAtPoint): Deleted.
+        (WebCore::drawDoubledAtPoint): Deleted.
+        * platform/spi/cocoa/LinkPresentationSPI.h: Added.
+        Improve the design of URL drag images.
+        The margins are increased, the background is now white, the text is
+        not drawn doubled-up, the title will now wrap to two lines, and the
+        domain name will appear simplified and de-punycoded.
+
+        Much of the implementation of text painting is borrowed from
+        <attachment> for now, but we should figure out how to generalize
+        it for UI-like parts of WebKit in the future.
+
 2017-05-04  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r216223.
index a94e40a..618912c 100644 (file)
                2D481F02146B5C5500AA7834 /* CrossfadeGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D2FC0551460CD6F00263633 /* CrossfadeGeneratedImage.h */; };
                2D481F03146B5C6500AA7834 /* GradientImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D2FC0561460CD6F00263633 /* GradientImage.cpp */; };
                2D481F04146B5C6B00AA7834 /* GradientImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D2FC0571460CD6F00263633 /* GradientImage.h */; };
+               2D4AEA031EBC0FE900C4A93A /* LinkPresentationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4AEA021EBC0FE900C4A93A /* LinkPresentationSPI.h */; };
                2D4F96F51A1ECC240098BF88 /* TextIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */; };
                2D4F96F61A1ECC240098BF88 /* TextIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D4F96F71A1ECC240098BF88 /* TextIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D413F601A187A3F0041A521 /* LookupSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookupSPI.h; sourceTree = "<group>"; };
                2D46F04D17B96FBD005647F0 /* IntPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntPoint.cpp; sourceTree = "<group>"; };
                2D46F04F17B96FD2005647F0 /* IntSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntSize.cpp; sourceTree = "<group>"; };
+               2D4AEA021EBC0FE900C4A93A /* LinkPresentationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkPresentationSPI.h; sourceTree = "<group>"; };
                2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextIndicator.cpp; sourceTree = "<group>"; };
                2D4F96F21A1ECC240098BF88 /* TextIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicator.h; sourceTree = "<group>"; };
                2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicatorWindow.h; sourceTree = "<group>"; };
                                44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */,
                                44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */,
                                44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */,
+                               2D4AEA021EBC0FE900C4A93A /* LinkPresentationSPI.h */,
                                CE12524E1A1A78D200864480 /* MachVMSPI.h */,
                                A19D93441A9FEC7200B46C24 /* NEFilterSourceSPI.h */,
                                9BB737641B41C03500AE13EB /* NSAttributedStringSPI.h */,
                                CE1252491A16C3BC00864480 /* MobileGestaltSPI.h in Headers */,
                                CDF2B0111820540600F2B424 /* MockBox.h in Headers */,
                                CDF4B7241E03BF8100E235A2 /* MockCDMFactory.h in Headers */,
+                               2D4AEA031EBC0FE900C4A93A /* LinkPresentationSPI.h in Headers */,
                                CDF4B7201E03BF6F00E235A2 /* MockCDMFactory.idl in Headers */,
                                51058AE01D67C229009A538C /* MockGamepad.h in Headers */,
                                51058AE21D67C229009A538C /* MockGamepadProvider.h in Headers */,
index 2473a43..e08b558 100644 (file)
@@ -50,7 +50,7 @@
 
 namespace WebCore {
 
-const int DragController::LinkDragBorderInset = -2;
+const int DragController::LinkDragBorderInset = -10;
 
 const int DragController::MaxOriginalImageArea = 1500 * 1500;
 const int DragController::DragIconRightInset = 7;
index 2a8dfd3..86433de 100644 (file)
 #import "BitmapImage.h"
 #import "CoreGraphicsSPI.h"
 #import "Element.h"
+#import "FloatRoundedRect.h"
 #import "FontCascade.h"
 #import "FontDescription.h"
 #import "FontSelector.h"
 #import "GraphicsContext.h"
 #import "Image.h"
-#import "URL.h"
+#import "LinkPresentationSPI.h"
+#import "SoftLinking.h"
 #import "StringTruncator.h"
 #import "TextIndicator.h"
 #import "TextRun.h"
+#import "URL.h"
 #import <wtf/NeverDestroyed.h>
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+SOFT_LINK_PRIVATE_FRAMEWORK(LinkPresentation)
+#endif
+
 namespace WebCore {
 
 IntSize dragImageSize(RetainPtr<NSImage> image)
 {
-    return (IntSize)[image.get() size];
+    return (IntSize)[image size];
 }
 
 void deleteDragImage(RetainPtr<NSImage>)
@@ -57,15 +64,15 @@ void deleteDragImage(RetainPtr<NSImage>)
 
 RetainPtr<NSImage> scaleDragImage(RetainPtr<NSImage> image, FloatSize scale)
 {
-    NSSize originalSize = [image.get() size];
+    NSSize originalSize = [image size];
     NSSize newSize = NSMakeSize((originalSize.width * scale.width()), (originalSize.height * scale.height()));
     newSize.width = roundf(newSize.width);
     newSize.height = roundf(newSize.height);
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [image.get() setScalesWhenResized:YES];
+    [image setScalesWhenResized:YES];
 #pragma clang diagnostic pop
-    [image.get() setSize:newSize];
+    [image setSize:newSize];
     return image;
 }
     
@@ -74,11 +81,11 @@ RetainPtr<NSImage> dissolveDragImageToFraction(RetainPtr<NSImage> image, float d
     if (!image)
         return nil;
 
-    RetainPtr<NSImage> dissolvedImage = adoptNS([[NSImage alloc] initWithSize:[image.get() size]]);
+    RetainPtr<NSImage> dissolvedImage = adoptNS([[NSImage alloc] initWithSize:[image size]]);
     
-    [dissolvedImage.get() lockFocus];
-    [image.get() drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, [image size].width, [image size].height) operation:NSCompositingOperationCopy fraction:delta];
-    [dissolvedImage.get() unlockFocus];
+    [dissolvedImage lockFocus];
+    [image drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, [image size].width, [image size].height) operation:NSCompositingOperationCopy fraction:delta];
+    [dissolvedImage unlockFocus];
 
     return dissolvedImage;
 }
@@ -100,7 +107,7 @@ RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationDescri
             FloatRect destRect(FloatPoint(), sizeRespectingOrientation);
 
             RetainPtr<NSImage> rotatedDragImage = adoptNS([[NSImage alloc] initWithSize:(NSSize)(sizeRespectingOrientation)]);
-            [rotatedDragImage.get() lockFocus];
+            [rotatedDragImage lockFocus];
 
             // ImageOrientation uses top-left coordinates, need to flip to bottom-left, apply...
             CGAffineTransform transform = CGAffineTransformMakeTranslation(0, destRect.height());
@@ -115,19 +122,19 @@ RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationDescri
             transform = CGAffineTransformScale(transform, 1, -1);
 
             RetainPtr<NSAffineTransform> cocoaTransform = adoptNS([[NSAffineTransform alloc] init]);
-            [cocoaTransform.get() setTransformStruct:*(NSAffineTransformStruct*)&transform];
-            [cocoaTransform.get() concat];
+            [cocoaTransform setTransformStruct:*(NSAffineTransformStruct*)&transform];
+            [cocoaTransform concat];
 
             [image->snapshotNSImage() drawInRect:destRect fromRect:NSMakeRect(0, 0, size.width(), size.height()) operation:NSCompositingOperationSourceOver fraction:1.0];
 
-            [rotatedDragImage.get() unlockFocus];
+            [rotatedDragImage unlockFocus];
 
             return rotatedDragImage;
         }
     }
 
     auto dragImage = image->snapshotNSImage();
-    [dragImage.get() setSize:(NSSize)size];
+    [dragImage setSize:(NSSize)size];
     return dragImage;
 }
     
@@ -147,200 +154,152 @@ RetainPtr<NSImage> createDragImageIconForCachedImageFilename(const String& filen
 }
 
 
-const float DragLabelBorderX = 4;
-//Keep border_y in synch with DragController::LinkDragBorderInset
-const float DragLabelBorderY = 2;
-const float DragLabelRadius = 5;
-const float LabelBorderYOffset = 2;
+const CGFloat linkImagePadding = 10; // Keep in sync with DragController::LinkDragBorderInset.
+const CGFloat linkImageDomainBaselineToTitleBaseline = 18;
+const CGFloat linkImageCornerRadius = 5;
+const CGFloat linkImageMaximumWidth = 400;
+const CGFloat linkImageFontSize = 11;
+const CFIndex linkImageTitleMaximumLineCount = 2;
 
-const float MinDragLabelWidthBeforeClip = 120;
-const float MaxDragLabelWidth = 320;
+struct LinkImageLayout {
+    LinkImageLayout(URL&, const String& title);
 
-const float DragLinkLabelFontsize = 11;
-const float DragLinkUrlFontSize = 10;
+    struct LabelLine {
+        FloatPoint origin;
+        RetainPtr<CTLineRef> line;
+    };
+    Vector<LabelLine> lines;
 
-// FIXME - we should move all the functionality of NSString extras to WebCore
-    
-static FontCascade& fontFromNSFont(NSFont *font)
-{
-    ASSERT(font);
-    static NSFont *currentFont;
-    static NeverDestroyed<FontCascade> currentRenderer;
-    
-    if ([font isEqual:currentFont])
-        return currentRenderer;
-    if (currentFont)
-        CFRelease(currentFont);
-    currentFont = font;
-    CFRetain(currentFont);
-    currentRenderer.get() = FontCascade(FontPlatformData(toCTFont(font), [font pointSize]));
-    return currentRenderer;
-}
+    FloatRect boundingRect;
 
-static bool canUseFastRenderer(const UniChar* buffer, unsigned length)
-{
-    unsigned i;
-    for (i = 0; i < length; i++) {
-        UCharDirection direction = u_charDirection(buffer[i]);
-        if (direction == U_RIGHT_TO_LEFT || direction > U_OTHER_NEUTRAL)
-            return false;
-    }
-    return true;
-}
-    
-static float widthWithFont(NSString *string, NSFont *font)
-{
-    if (!font)
-        return 0;
+private:
+    void addLine(CTLineRef, const Vector<CGPoint>& origins, CFIndex lineIndex, CGFloat x, CGFloat& y, CGFloat& maximumUsedTextWidth, bool isLastLine);
+};
 
-    unsigned length = [string length];
-    Vector<UniChar, 2048> buffer(length);
-    
-    [string getCharacters:buffer.data()];
-    
-    if (canUseFastRenderer(buffer.data(), length)) {
-        FontCascade webCoreFont(FontPlatformData(toCTFont(font), [font pointSize]));
-        TextRun run(StringView(buffer.data(), length));
-        return webCoreFont.width(run);
-    }
-    
-    return [string sizeWithAttributes:[NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, nil]].width;
-}
-    
-static void drawAtPoint(NSString *string, NSPoint point, NSFont *font, NSColor *textColor)
+LinkImageLayout::LinkImageLayout(URL& url, const String& titleString)
 {
-    if (!font)
-        return;
+    NSString *title = nsStringNilIfEmpty(titleString);
+    NSURL *cocoaURL = url;
+    NSString *absoluteURLString = [cocoaURL absoluteString];
 
-    unsigned length = [string length];
-    Vector<UniChar, 2048> buffer(length);
-    
-    [string getCharacters:buffer.data()];
-    
-    if (canUseFastRenderer(buffer.data(), length)) {
-        // The following is a half-assed attempt to match AppKit's rounding rules for drawAtPoint.
-        // It's probably incorrect for high DPI.
-        // If you change this, be sure to test all the text drawn this way in Safari, including
-        // the status bar, bookmarks bar, tab bar, and activity window.
-        point.y = CGCeiling(point.y);
-        
-        NSGraphicsContext *nsContext = [NSGraphicsContext currentContext];
-        CGContextRef cgContext = static_cast<CGContextRef>([nsContext graphicsPort]);
-        GraphicsContext graphicsContext(cgContext);    
-        
-        // Safari doesn't flip the NSGraphicsContext before calling WebKit, yet WebCore requires a flipped graphics context.
-        BOOL flipped = [nsContext isFlipped];
-        if (!flipped)
-            CGContextScaleCTM(cgContext, 1, -1);
-
-        FontCascade webCoreFont(FontPlatformData(toCTFont(font), [font pointSize]), Antialiased);
-        TextRun run(StringView(buffer.data(), length));
-
-        CGFloat red;
-        CGFloat green;
-        CGFloat blue;
-        CGFloat alpha;
-        [[textColor colorUsingColorSpaceName:NSDeviceRGBColorSpace] getRed:&red green:&green blue:&blue alpha:&alpha];
-        graphicsContext.setFillColor(makeRGBA(red * 255, green * 255, blue * 255, alpha * 255));
-        
-        webCoreFont.drawText(graphicsContext, run, FloatPoint(point.x, (flipped ? point.y : (-1 * point.y))));
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+    LinkPresentationLibrary();
+    NSString *domain = [cocoaURL _lp_simplifiedDisplayString];
+#else
+    NSString *domain = absoluteURLString;
+#endif
+
+    if ([title isEqualToString:absoluteURLString])
+        title = nil;
+
+    NSFont *titleFont = [NSFont boldSystemFontOfSize:linkImageFontSize];
+    NSFont *domainFont = [NSFont systemFontOfSize:linkImageFontSize];
+
+    NSColor *titleColor = [NSColor labelColor];
+    NSColor *domainColor = [NSColor secondaryLabelColor];
+
+    CGFloat maximumAvailableWidth = linkImageMaximumWidth - linkImagePadding * 2;
+
+    CGFloat currentY = linkImagePadding;
+    CGFloat maximumUsedTextWidth = 0;
+
+    auto buildLines = [this, maximumAvailableWidth, &maximumUsedTextWidth, &currentY] (NSString *text, NSColor *color, NSFont *font, CFIndex maximumLines, CTLineTruncationType truncationType) {
+        NSDictionary *textAttributes = @{
+            (id)kCTFontAttributeName: font,
+            (id)kCTForegroundColorAttributeName: color
+        };
+        RetainPtr<NSAttributedString> attributedText = adoptNS([[NSAttributedString alloc] initWithString:text attributes:textAttributes]);
+        RetainPtr<CTFramesetterRef> textFramesetter = adoptCF(CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attributedText.get()));
+
+        CFRange fitRange;
+        CGSize textSize = CTFramesetterSuggestFrameSizeWithConstraints(textFramesetter.get(), CFRangeMake(0, 0), nullptr, CGSizeMake(maximumAvailableWidth, CGFLOAT_MAX), &fitRange);
+
+        RetainPtr<CGPathRef> textPath = adoptCF(CGPathCreateWithRect(CGRectMake(0, 0, textSize.width, textSize.height), nullptr));
+        RetainPtr<CTFrameRef> textFrame = adoptCF(CTFramesetterCreateFrame(textFramesetter.get(), fitRange, textPath.get(), nullptr));
+
+        CFArrayRef ctLines = CTFrameGetLines(textFrame.get());
+        CFIndex lineCount = CFArrayGetCount(ctLines);
+        if (!lineCount)
+            return;
+
+        Vector<CGPoint> origins(lineCount);
+        CTFrameGetLineOrigins(textFrame.get(), CFRangeMake(0, 0), origins.data());
+
+        // Lay out and record the first (maximumLines - 1) lines.
+        CFIndex lineIndex = 0;
+        for (; lineIndex < std::min(maximumLines - 1, lineCount); ++lineIndex) {
+            CTLineRef line = (CTLineRef)CFArrayGetValueAtIndex(ctLines, lineIndex);
+            addLine(line, origins, lineIndex, linkImagePadding, currentY, maximumUsedTextWidth, lineIndex == lineCount - 1);
+        }
+
+        if (lineIndex == lineCount)
+            return;
+
+        // We had text that didn't fit in the first (maximumLines - 1) lines.
+        // Combine it into one last line, and truncate it.
+        CTLineRef firstRemainingLine = (CTLineRef)CFArrayGetValueAtIndex(ctLines, lineIndex);
+        CFIndex remainingRangeStart = CTLineGetStringRange(firstRemainingLine).location;
+        NSRange remainingRange = NSMakeRange(remainingRangeStart, [attributedText length] - remainingRangeStart);
+        NSAttributedString *remainingString = [attributedText attributedSubstringFromRange:remainingRange];
+        RetainPtr<CTLineRef> remainingLine = adoptCF(CTLineCreateWithAttributedString((CFAttributedStringRef)remainingString));
+        RetainPtr<NSAttributedString> ellipsisString = adoptNS([[NSAttributedString alloc] initWithString:@"\u2026" attributes:textAttributes]);
+        RetainPtr<CTLineRef> ellipsisLine = adoptCF(CTLineCreateWithAttributedString((CFAttributedStringRef)ellipsisString.get()));
+        RetainPtr<CTLineRef> truncatedLine = adoptCF(CTLineCreateTruncatedLine(remainingLine.get(), maximumAvailableWidth, truncationType, ellipsisLine.get()));
         
-        if (!flipped)
-            CGContextScaleCTM(cgContext, 1, -1);
-    } else {
-        // The given point is on the baseline.
-        if ([[NSView focusView] isFlipped])
-            point.y -= [font ascender];
-        else
-            point.y += [font descender];
-                
-        [string drawAtPoint:point withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, textColor, NSForegroundColorAttributeName, nil]];
-    }
-}
-    
-static void drawDoubledAtPoint(NSString *string, NSPoint textPoint, NSColor *topColor, NSColor *bottomColor, NSFont *font)
-{
-        // turn off font smoothing so translucent text draws correctly (Radar 3118455)
-        drawAtPoint(string, textPoint, font, bottomColor);
+        if (!truncatedLine)
+            truncatedLine = remainingLine;
         
-        textPoint.y += 1;
-        drawAtPoint(string, textPoint, font, topColor);
-}
+        addLine(truncatedLine.get(), origins, lineIndex, linkImagePadding, currentY, maximumUsedTextWidth, true);
+    };
 
-DragImageRef createDragImageForLink(Element&, URL& url, const String& title, TextIndicatorData&, FontRenderingMode, float)
-{
-    NSString *label = nsStringNilIfEmpty(title);
-    NSURL *cocoaURL = url;
-    NSString *urlString = [cocoaURL absoluteString];
+    if (title)
+        buildLines(title, titleColor, titleFont, linkImageTitleMaximumLineCount, kCTLineTruncationEnd);
 
-    BOOL drawURLString = YES;
-    BOOL clipURLString = NO;
-    BOOL clipLabelString = NO;
+    if (title && domain)
+        currentY += linkImageDomainBaselineToTitleBaseline - (domainFont.ascender - domainFont.descender);
 
-    if (!label) {
-        drawURLString = NO;
-        label = urlString;
-    }
+    if (domain)
+        buildLines(domain, domainColor, domainFont, 1, kCTLineTruncationMiddle);
 
-    NSFont *labelFont = [[NSFontManager sharedFontManager] convertFont:[NSFont systemFontOfSize:DragLinkLabelFontsize]
-                                                           toHaveTrait:NSBoldFontMask];
-    NSFont *urlFont = [NSFont systemFontOfSize:DragLinkUrlFontSize];
+    currentY += linkImagePadding;
 
-    ASSERT(labelFont);
-    ASSERT(urlFont);
+    boundingRect = FloatRect(0, 0, maximumUsedTextWidth + linkImagePadding * 2, currentY);
+}
 
-    NSSize labelSize;
-    labelSize.width = widthWithFont(label, labelFont);
-    labelSize.height = [labelFont ascender] - [labelFont descender];
-    if (labelSize.width > MaxDragLabelWidth){
-        labelSize.width = MaxDragLabelWidth;
-        clipLabelString = YES;
-    }
+void LinkImageLayout::addLine(CTLineRef ctLine, const Vector<CGPoint>& origins, CFIndex lineIndex, CGFloat x, CGFloat& y, CGFloat& maximumUsedTextWidth, bool isLastLine)
+{
+    CGRect lineBounds = CTLineGetBoundsWithOptions(ctLine, 0);
+    CGFloat trailingWhitespaceWidth = CTLineGetTrailingWhitespaceWidth(ctLine);
+    CGFloat lineWidthIgnoringTrailingWhitespace = lineBounds.size.width - trailingWhitespaceWidth;
+    maximumUsedTextWidth = std::max(maximumUsedTextWidth, lineWidthIgnoringTrailingWhitespace);
 
-    NSSize imageSize;
-    imageSize.width = labelSize.width + DragLabelBorderX * 2;
-    imageSize.height = labelSize.height + DragLabelBorderY * 2;
-    if (drawURLString) {
-        NSSize urlStringSize;
-        urlStringSize.width = widthWithFont(urlString, urlFont);
-        urlStringSize.height = [urlFont ascender] - [urlFont descender];
-        imageSize.height += urlStringSize.height;
-        if (urlStringSize.width > MaxDragLabelWidth) {
-            imageSize.width = std::max(MaxDragLabelWidth + DragLabelBorderY * 2, MinDragLabelWidthBeforeClip);
-            clipURLString = YES;
-        } else
-            imageSize.width = std::max(labelSize.width + DragLabelBorderX * 2, urlStringSize.width + DragLabelBorderX * 2);
-    }
-    NSImage *dragImage = [[[NSImage alloc] initWithSize: imageSize] autorelease];
-    [dragImage lockFocus];
+    if (lineIndex)
+        y += origins[lineIndex - 1].y - origins[lineIndex].y;
 
-    [[NSColor colorWithDeviceRed: 0.7f green: 0.7f blue: 0.7f alpha: 0.8f] set];
+    LinkImageLayout::LabelLine line;
+    line.line = ctLine;
+    line.origin = FloatPoint(x, y);
+    lines.append(line);
 
-    // Drag a rectangle with rounded corners
-    NSBezierPath *path = [NSBezierPath bezierPath];
-    [path appendBezierPathWithOvalInRect: NSMakeRect(0, 0, DragLabelRadius * 2, DragLabelRadius * 2)];
-    [path appendBezierPathWithOvalInRect: NSMakeRect(0, imageSize.height - DragLabelRadius * 2, DragLabelRadius * 2, DragLabelRadius * 2)];
-    [path appendBezierPathWithOvalInRect: NSMakeRect(imageSize.width - DragLabelRadius * 2, imageSize.height - DragLabelRadius * 2, DragLabelRadius * 2, DragLabelRadius * 2)];
-    [path appendBezierPathWithOvalInRect: NSMakeRect(imageSize.width - DragLabelRadius * 2, 0, DragLabelRadius * 2, DragLabelRadius * 2)];
+    if (isLastLine)
+        y += lineBounds.size.height;
+}
 
-    [path appendBezierPathWithRect: NSMakeRect(DragLabelRadius, 0, imageSize.width - DragLabelRadius * 2, imageSize.height)];
-    [path appendBezierPathWithRect: NSMakeRect(0, DragLabelRadius, DragLabelRadius + 10, imageSize.height - 2 * DragLabelRadius)];
-    [path appendBezierPathWithRect: NSMakeRect(imageSize.width - DragLabelRadius - 20, DragLabelRadius, DragLabelRadius + 20, imageSize.height - 2 * DragLabelRadius)];
-    [path fill];
+DragImageRef createDragImageForLink(Element&, URL& url, const String& title, TextIndicatorData&, FontRenderingMode, float)
+{
+    LinkImageLayout layout(url, title);
 
-    NSColor *topColor = [NSColor colorWithDeviceWhite:0.0f alpha:0.75f];
-    NSColor *bottomColor = [NSColor colorWithDeviceWhite:1.0f alpha:0.5f];
-    if (drawURLString && urlFont) {
-        if (clipURLString)
-            urlString = StringTruncator::centerTruncate(urlString, imageSize.width - (DragLabelBorderX * 2), fontFromNSFont(urlFont));
+    RetainPtr<NSImage> dragImage = adoptNS([[NSImage alloc] initWithSize:layout.boundingRect.size()]);
+    [dragImage lockFocus];
 
-       drawDoubledAtPoint(urlString, NSMakePoint(DragLabelBorderX, DragLabelBorderY - [urlFont descender]), topColor, bottomColor, urlFont);
-    }
+    GraphicsContext context((CGContextRef)[NSGraphicsContext currentContext].graphicsPort);
+    context.fillRoundedRect(FloatRoundedRect(layout.boundingRect, FloatRoundedRect::Radii(linkImageCornerRadius)), Color::white);
 
-    if (labelFont) {
-        if (clipLabelString)
-            label = StringTruncator::rightTruncate(label, imageSize.width - (DragLabelBorderX * 2), fontFromNSFont(labelFont));
-        drawDoubledAtPoint(label, NSMakePoint(DragLabelBorderX, imageSize.height - LabelBorderYOffset - [labelFont pointSize]), topColor, bottomColor, labelFont);
+    for (const auto& line : layout.lines) {
+        GraphicsContextStateSaver saver(context);
+        context.translate(line.origin.x(), layout.boundingRect.height() - line.origin.y() - linkImagePadding);
+        CGContextSetTextPosition(context.platformContext(), 0, 0);
+        CTLineDraw(line.line.get(), context.platformContext());
     }
 
     [dragImage unlockFocus];
diff --git a/Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h b/Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h
new file mode 100644 (file)
index 0000000..bc2bed1
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <LinkPresentation/LPNSURLExtras.h>
+
+#else
+
+@interface NSURL ()
+- (NSString *)_lp_simplifiedDisplayString;
+@end
+
+#endif
+
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200