<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176099] trunk/Source/WebKit/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176099">176099</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-13 15:30:45 -0800 (Thu, 13 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK1: Support default actions for video
https://bugs.webkit.org/show_bug.cgi?id=138713
-and corresponding-
rdar://problem/18877520
Reviewed by Tim Horton.
Call setToNonShadowAncestor() for media HitTestResults.
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController performHitTestAtPoint:]):
Default items and actions.
(-[WebActionMenuController _defaultMenuItemsForVideo:]):
(-[WebActionMenuController _copyVideoURL:]):
(-[WebActionMenuController _saveVideoToDownloads:]):
(-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]):
(-[WebActionMenuController _defaultMenuItemsForHitTestResult:]):
* WebView/WebUIDelegatePrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176098 => 176099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-13 23:30:03 UTC (rev 176098)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-13 23:30:45 UTC (rev 176099)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-13 Beth Dakin <bdakin@apple.com>
+
+ WK1: Support default actions for video
+ https://bugs.webkit.org/show_bug.cgi?id=138713
+ -and corresponding-
+ rdar://problem/18877520
+
+ Reviewed by Tim Horton.
+
+ Call setToNonShadowAncestor() for media HitTestResults.
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController performHitTestAtPoint:]):
+
+ Default items and actions.
+ (-[WebActionMenuController _defaultMenuItemsForVideo:]):
+ (-[WebActionMenuController _copyVideoURL:]):
+ (-[WebActionMenuController _saveVideoToDownloads:]):
+ (-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]):
+ (-[WebActionMenuController _defaultMenuItemsForHitTestResult:]):
+ * WebView/WebUIDelegatePrivate.h:
+
</ins><span class="cx"> 2014-11-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WK1: Update icon for Add to Reading List
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176098 => 176099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-13 23:30:03 UTC (rev 176098)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-13 23:30:45 UTC (rev 176099)
</span><span class="lines">@@ -110,6 +110,15 @@
</span><span class="cx"> HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active;
</span><span class="cx"> _hitTestResult = coreFrame->eventHandler().hitTestResultAtPoint(IntPoint(point), hitType);
</span><span class="cx">
</span><ins>+ // We hit test including shadow content to get the desired result for editable text regions.
+ // But for media, we want to re-set to the shadow root.
+ if (Node* node = _hitTestResult.innerNode()) {
+ if (Element* shadowHost = node->shadowHost()) {
+ if (shadowHost->isMediaElement())
+ _hitTestResult.setToNonShadowAncestor();
+ }
+ }
+
</ins><span class="cx"> return [[[WebElementDictionary alloc] initWithHitTestResult:_hitTestResult] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -385,6 +394,44 @@
</span><span class="cx"> [_webView _downloadURL:_hitTestResult.absoluteImageURL()];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark Video actions
+
+- (NSArray*)_defaultMenuItemsForVideo:(WebElementDictionary *)hitTestResult
+{
+ RetainPtr<NSMenuItem> copyVideoURLItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyVideoURL withHitTestResult:hitTestResult];
+
+ RetainPtr<NSMenuItem> saveToDownloadsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagSaveVideoToDownloads withHitTestResult:hitTestResult];
+ if (!_hitTestResult.isDownloadableMedia() || !_webView.downloadDelegate)
+ [saveToDownloadsItem setEnabled:NO];
+
+ RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:WebActionMenuItemTagShareVideo withHitTestResult:hitTestResult];
+ NSString *urlToShare = _hitTestResult.absoluteMediaURL();
+ if (!_hitTestResult.isDownloadableMedia()) {
+ [saveToDownloadsItem setEnabled:NO];
+ urlToShare = [_webView mainFrameURL];
+ }
+ _sharingServicePicker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ urlToShare ]]);
+ [_sharingServicePicker setDelegate:self];
+ [shareItem setSubmenu:[_sharingServicePicker menu]];
+
+ return @[ copyVideoURLItem.get(), [NSMenuItem separatorItem], saveToDownloadsItem.get(), shareItem.get() ];
+}
+
+- (void)_copyVideoURL:(id)sender
+{
+ NSString *urlToCopy = _hitTestResult.absoluteMediaURL();
+ if (!_hitTestResult.isDownloadableMedia())
+ urlToCopy = [_webView mainFrameURL];
+
+ [[NSPasteboard generalPasteboard] clearContents];
+ [[NSPasteboard generalPasteboard] writeObjects:@[ urlToCopy ]];
+}
+
+- (void)_saveVideoToDownloads:(id)sender
+{
+ [_webView _downloadURL:_hitTestResult.absoluteMediaURL()];
+}
+
</ins><span class="cx"> #pragma mark Text actions
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForText:(WebElementDictionary *)hitTestResult
</span><span class="lines">@@ -664,6 +711,23 @@
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuShare"];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case WebActionMenuItemTagCopyVideoURL:
+ selector = @selector(_copyVideoURL:);
+ title = WEB_UI_STRING_KEY("Copy", "Copy (video action menu item)", "video action menu item");
+ image = [NSImage imageNamed:@"NSActionMenuCopy"];
+ break;
+
+ case WebActionMenuItemTagSaveVideoToDownloads:
+ selector = @selector(_saveVideoToDownloads:);
+ title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item");
+ image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
+ break;
+
+ case WebActionMenuItemTagShareVideo:
+ title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item");
+ image = [NSImage imageNamed:@"NSActionMenuShare"];
+ break;
+
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nil;
</span><span class="lines">@@ -690,6 +754,11 @@
</span><span class="cx"> return [self _defaultMenuItemsForLink:hitTestResult];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!_hitTestResult.absoluteMediaURL().isEmpty()) {
+ _type = WebActionMenuVideo;
+ return [self _defaultMenuItemsForVideo:hitTestResult];
+ }
+
</ins><span class="cx"> if (_hitTestResult.image() && !_hitTestResult.absoluteImageURL().isEmpty()) {
</span><span class="cx"> _type = WebActionMenuImage;
</span><span class="cx"> return [self _defaultMenuItemsForImage:hitTestResult];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (176098 => 176099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-11-13 23:30:03 UTC (rev 176098)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-11-13 23:30:45 UTC (rev 176099)
</span><span class="lines">@@ -124,7 +124,10 @@
</span><span class="cx"> WebActionMenuItemTagCopyImage,
</span><span class="cx"> WebActionMenuItemTagAddImageToPhotos,
</span><span class="cx"> WebActionMenuItemTagSaveImageToDownloads,
</span><del>- WebActionMenuItemTagShareImage
</del><ins>+ WebActionMenuItemTagShareImage,
+ WebActionMenuItemTagCopyVideoURL,
+ WebActionMenuItemTagSaveVideoToDownloads,
+ WebActionMenuItemTagShareVideo
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -134,7 +137,8 @@
</span><span class="cx"> WebActionMenuEditableText,
</span><span class="cx"> WebActionMenuWhitespaceInEditableArea,
</span><span class="cx"> WebActionMenuEditableTextWithSuggestions,
</span><del>- WebActionMenuImage
</del><ins>+ WebActionMenuImage,
+ WebActionMenuVideo
</ins><span class="cx"> } WebActionMenuType;
</span><span class="cx">
</span><span class="cx"> // Message Sources.
</span></span></pre>
</div>
</div>
</body>
</html>