Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix build for platforms where HAVE(LINK_PREVIEW) is false
https://bugs.webkit.org/show_bug.cgi?id=163607

Patch by Megan Gardner <megan_gardner@apple.com> on 2016-10-18
Reviewed by Tim Horton.

Added needed # for link preview

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _contentsOfUserInterfaceItem:]):

Canonical link: https://commits.webkit.org/181391@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207478 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
megangardner authored and webkit-commit-queue committed Oct 18, 2016
1 parent 4866cc7 commit d98f635
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
2016-10-18 Megan Gardner <megan_gardner@apple.com>

Fix build for platforms where HAVE(LINK_PREVIEW) is false
https://bugs.webkit.org/show_bug.cgi?id=163607

Reviewed by Tim Horton.

Added needed # for link preview

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _contentsOfUserInterfaceItem:]):

2016-10-18 Joseph Pecoraro <pecoraro@apple.com>

Remote Web Inspector: Timeline UI not updating while recording
Expand Down
4 changes: 3 additions & 1 deletion Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Expand Up @@ -3848,11 +3848,13 @@ - (NSDictionary *)_contentsOfUserInterfaceItem:(NSString *)userInterfaceItem
{
if ([userInterfaceItem isEqualToString:@"actionSheet"])
return @{ userInterfaceItem: [_actionSheetAssistant currentAvailableActionTitles] };


#if HAVE(LINK_PREVIEW)
if ([userInterfaceItem isEqualToString:@"linkPreviewPopoverContents"]) {
NSString *url = [_previewItemController previewData][UIPreviewDataLink];
return @{ userInterfaceItem: @{ @"pageURL": url } };
}
#endif

return nil;
}
Expand Down

0 comments on commit d98f635

Please sign in to comment.