<!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>[183403] trunk</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/183403">183403</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-27 11:38:29 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/182879">r182879</a>): Images and video can no longer be downloaded
https://bugs.webkit.org/show_bug.cgi?id=144267
<rdar://problem/20702844>
Reviewed by Simon Fraser.
Source/WebKit/mac:
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _createActionMenuItemForTag:]): Check for
"!WebCore::protocolIs(..., "file")" for image and media downloads.
Source/WebKit2:
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _createActionMenuItemForTag:]): Check for
"!WebCore::protocolIs(..., "file")" for image and media downloads.
Tools:
Revise tests to check for proper download menu state.
1. Downloading a loal image should be disabled.
2. Downloading a local media file should be disabled.
3. Downloading non-downloadable media should be disabled.
* TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm:
(TestWebKitAPI::TEST):</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCActionMenusmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183402 => 183403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-27 18:36:14 UTC (rev 183402)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-27 18:38:29 UTC (rev 183403)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-27 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION(r182879): Images and video can no longer be downloaded
+ https://bugs.webkit.org/show_bug.cgi?id=144267
+ <rdar://problem/20702844>
+
+ Reviewed by Simon Fraser.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _createActionMenuItemForTag:]): Check for
+ "!WebCore::protocolIs(..., "file")" for image and media downloads.
+
</ins><span class="cx"> 2015-04-26 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement ES6 template literals
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (183402 => 183403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-04-27 18:36:14 UTC (rev 183402)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-04-27 18:38:29 UTC (rev 183403)
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> selector = @selector(_saveImageToDownloads:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (image action menu item)", "image action menu item");
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
</span><del>- enabled = WebCore::protocolIs(_hitTestResult.absoluteImageURL(), "file");
</del><ins>+ enabled = !WebCore::protocolIs(_hitTestResult.absoluteImageURL(), "file");
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagCopyVideoURL:
</span><span class="lines">@@ -704,7 +704,7 @@
</span><span class="cx"> selector = @selector(_saveVideoToDownloads:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item");
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
</span><del>- enabled = WebCore::protocolIs(_hitTestResult.absoluteMediaURL(), "file");
</del><ins>+ enabled = !WebCore::protocolIs(_hitTestResult.absoluteMediaURL(), "file") && _hitTestResult.isDownloadableMedia();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183402 => 183403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-27 18:36:14 UTC (rev 183402)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-27 18:38:29 UTC (rev 183403)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-27 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION(r182879): Images and video can no longer be downloaded
+ https://bugs.webkit.org/show_bug.cgi?id=144267
+ <rdar://problem/20702844>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _createActionMenuItemForTag:]): Check for
+ "!WebCore::protocolIs(..., "file")" for image and media downloads.
+
</ins><span class="cx"> 2015-04-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] TestWebKitAPI's forwarding header generator should depend on WebKit2's generator
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (183402 => 183403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2015-04-27 18:36:14 UTC (rev 183402)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2015-04-27 18:38:29 UTC (rev 183403)
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> selector = @selector(_saveImageToDownloads:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (image action menu item)", "image action menu item");
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
</span><del>- enabled = WebCore::protocolIs(hitTestResult->absoluteImageURL(), "file");
</del><ins>+ enabled = !WebCore::protocolIs(hitTestResult->absoluteImageURL(), "file");
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagCopyText:
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx"> selector = @selector(_saveVideoToDownloads:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item");
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
</span><del>- enabled = WebCore::protocolIs(hitTestResult->absoluteMediaURL(), "file");
</del><ins>+ enabled = !WebCore::protocolIs(hitTestResult->absoluteMediaURL(), "file") && hitTestResult->isDownloadableMedia();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183402 => 183403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-27 18:36:14 UTC (rev 183402)
+++ trunk/Tools/ChangeLog 2015-04-27 18:38:29 UTC (rev 183403)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-27 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION(r182879): Images and video can no longer be downloaded
+ https://bugs.webkit.org/show_bug.cgi?id=144267
+ <rdar://problem/20702844>
+
+ Reviewed by Simon Fraser.
+
+ Revise tests to check for proper download menu state.
+ 1. Downloading a loal image should be disabled.
+ 2. Downloading a local media file should be disabled.
+ 3. Downloading non-downloadable media should be disabled.
+
+ * TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2015-04-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Merge run-launcher into run-minibrowser
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCActionMenusmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm (183402 => 183403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm 2015-04-27 18:36:14 UTC (rev 183402)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm 2015-04-27 18:38:29 UTC (rev 183403)
</span><span class="lines">@@ -665,14 +665,11 @@
</span><span class="cx"> EXPECT_EQ(174, image.size.height);
</span><span class="cx"> }];
</span><span class="cx">
</span><del>- // Download an image.
</del><ins>+ // Download a local image (should be disabled)
</ins><span class="cx"> activeDownloadContext.shouldCheckForImage = true;
</span><span class="cx"> [wkView runMenuSequenceAtPoint:windowPointForTarget(TargetType::Image) preDidCloseMenuHandler:^() {
</span><span class="cx"> EXPECT_EQ(kWKActionMenuImage, [wkView _actionMenuResult].type);
</span><del>-
- didFinishDownload = false;
- performMenuItemAtIndexOfTypeAsync([wkView _actionMenu], 2, kWKContextActionItemTagSaveImageToDownloads);
- Util::run(&didFinishDownload);
</del><ins>+ ensureMenuItemAtIndexOfTypeIsDisabled([wkView _actionMenu], 2, kWKContextActionItemTagSaveImageToDownloads);
</ins><span class="cx"> }];
</span><span class="cx"> activeDownloadContext.shouldCheckForImage = false;
</span><span class="cx">
</span><span class="lines">@@ -689,6 +686,9 @@
</span><span class="cx"> performMenuItemAtIndexOfTypeAsync([wkView _actionMenu], 0, kWKContextActionItemTagCopyVideoURL);
</span><span class="cx"> NSString *videoURL = watchPasteboardForString();
</span><span class="cx"> EXPECT_WK_STREQ(@"test.mp4", [videoURL lastPathComponent]);
</span><ins>+
+ // Since this video is a local file, it should be disabled.
+ ensureMenuItemAtIndexOfTypeIsDisabled([wkView _actionMenu], 2, kWKContextActionItemTagSaveVideoToDownloads);
</ins><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> // Copying a video URL for a non-downloadable video should result in copying the page URL instead.
</span></span></pre>
</div>
</div>
</body>
</html>