Title: [225207] trunk/Source/WebCore
- Revision
- 225207
- Author
- [email protected]
- Date
- 2017-11-27 18:10:12 -0800 (Mon, 27 Nov 2017)
Log Message
Web Content process crashes when dragging a link in recovery mode
https://bugs.webkit.org/show_bug.cgi?id=180058
<rdar://problem/35172170>
Reviewed by Alexey Proskuryakov.
* platform/mac/DragImageMac.mm:
(WebCore::LinkImageLayout::LinkImageLayout):
LinkPresentation isn't available in the base system. Make it optional,
and fall back to the full URL like we do on platforms where it doesn't
exist at all.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (225206 => 225207)
--- trunk/Source/WebCore/ChangeLog 2017-11-28 01:21:39 UTC (rev 225206)
+++ trunk/Source/WebCore/ChangeLog 2017-11-28 02:10:12 UTC (rev 225207)
@@ -1,3 +1,17 @@
+2017-11-27 Tim Horton <[email protected]>
+
+ Web Content process crashes when dragging a link in recovery mode
+ https://bugs.webkit.org/show_bug.cgi?id=180058
+ <rdar://problem/35172170>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/mac/DragImageMac.mm:
+ (WebCore::LinkImageLayout::LinkImageLayout):
+ LinkPresentation isn't available in the base system. Make it optional,
+ and fall back to the full URL like we do on platforms where it doesn't
+ exist at all.
+
2017-11-27 Chris Dumez <[email protected]>
Move callOnMainThreadAndWait() from SocketStreamHandleImplCFNet.cpp to MainThread.h
Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (225206 => 225207)
--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2017-11-28 01:21:39 UTC (rev 225206)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2017-11-28 02:10:12 UTC (rev 225207)
@@ -45,7 +45,7 @@
#import <wtf/SoftLinking.h>
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-SOFT_LINK_PRIVATE_FRAMEWORK(LinkPresentation)
+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(LinkPresentation)
#endif
namespace WebCore {
@@ -198,11 +198,10 @@
NSURL *cocoaURL = url;
NSString *absoluteURLString = [cocoaURL absoluteString];
+ NSString *domain = absoluteURLString;
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- LinkPresentationLibrary();
- NSString *domain = [cocoaURL _lp_simplifiedDisplayString];
-#else
- NSString *domain = absoluteURLString;
+ if (LinkPresentationLibrary())
+ domain = [cocoaURL _lp_simplifiedDisplayString];
#endif
if ([title isEqualToString:absoluteURLString])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
