Title: [216168] trunk/Source/WebKit2
- Revision
- 216168
- Author
- timothy_hor...@apple.com
- Date
- 2017-05-03 19:02:58 -0700 (Wed, 03 May 2017)
Log Message
Maintain interaction information imageURL as a URL, not a string
https://bugs.webkit.org/show_bug.cgi?id=171639
Reviewed by Sam Weinig.
* Shared/ios/InteractionInformationAtPosition.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
(-[WKContentView _previewItemController:commitPreview:]):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (216167 => 216168)
--- trunk/Source/WebKit2/ChangeLog 2017-05-04 01:40:45 UTC (rev 216167)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-04 02:02:58 UTC (rev 216168)
@@ -1,3 +1,17 @@
+2017-05-03 Timothy Horton <timothy_hor...@apple.com>
+
+ Maintain interaction information imageURL as a URL, not a string
+ https://bugs.webkit.org/show_bug.cgi?id=171639
+
+ Reviewed by Sam Weinig.
+
+ * Shared/ios/InteractionInformationAtPosition.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+ (-[WKContentView _previewItemController:commitPreview:]):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
2017-05-03 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r216160 and r216161.
Modified: trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h (216167 => 216168)
--- trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h 2017-05-04 01:40:45 UTC (rev 216167)
+++ trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h 2017-05-04 02:02:58 UTC (rev 216168)
@@ -58,7 +58,7 @@
#endif
WebCore::FloatPoint adjustedPointForNodeRespondingToClickEvents;
WebCore::URL url;
- String imageURL;
+ WebCore::URL imageURL;
String title;
String idAttribute;
WebCore::IntRect bounds;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (216167 => 216168)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-05-04 01:40:45 UTC (rev 216167)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-05-04 02:02:58 UTC (rev 216168)
@@ -4277,7 +4277,7 @@
if (canShowLinkPreview) {
*type = UIPreviewItemTypeLink;
if (useImageURLForLink)
- dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
+ dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
else
dataForPreview[UIPreviewDataLink] = (NSURL *)linkURL;
if (_positionInformation.isDataDetectorLink) {
@@ -4306,7 +4306,7 @@
}
} else if (canShowImagePreview) {
*type = UIPreviewItemTypeImage;
- dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
+ dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
} else if (canShowAttachmentPreview) {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
*type = UIPreviewItemTypeAttachment;
@@ -4440,10 +4440,10 @@
id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
if ([_previewItemController type] == UIPreviewItemTypeImage) {
if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)]) {
- String absoluteImageURL = _positionInformation.imageURL;
- if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
+ const URL& imageURL = _positionInformation.imageURL;
+ if (imageURL.isEmpty() || !(imageURL.protocolIsInHTTPFamily() || imageURL.protocolIs("data")))
return;
- [uiDelegate _webView:_webView commitPreviewedImageWithURL:[NSURL _web_URLWithWTFString:absoluteImageURL]];
+ [uiDelegate _webView:_webView commitPreviewedImageWithURL:(NSURL *)imageURL];
return;
}
return;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (216167 => 216168)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-05-04 01:40:45 UTC (rev 216167)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-05-04 02:02:58 UTC (rev 216168)
@@ -2499,7 +2499,7 @@
if (renderImage.cachedImage() && !renderImage.cachedImage()->errorOccurred()) {
if (Image* image = renderImage.cachedImage()->imageForRenderer(&renderImage)) {
if (image->width() > 1 && image->height() > 1) {
- info.imageURL = [(NSURL *)element->document().completeURL(renderImage.cachedImage()->url()) absoluteString];
+ info.imageURL = element->document().completeURL(renderImage.cachedImage()->url());
info.isAnimatedImage = image->isAnimated();
if (request.includeSnapshot) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
