<!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>[182879] trunk/Source</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/182879">182879</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-15 20:57:51 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Disable "Save to Downloads" option for local files
https://bugs.webkit.org/show_bug.cgi?id=143794
Reviewed by Tim Horton.
Disable the Image and Media download options if the download
target is a local file. We can only download web resources;
anything else is actually a no-op.
Source/WebCore:
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::checkOrEnableIfNeeded): Disable
menu item if appropriate.
Source/WebKit/mac:
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _defaultMenuItemsForImage]):
(-[WebActionMenuController _defaultMenuItemsForVideo]):
Source/WebKit2:
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _defaultMenuItemsForVideo]):
(-[WKActionMenuController _defaultMenuItemsForImage]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182878 => 182879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-16 03:40:14 UTC (rev 182878)
+++ trunk/Source/WebCore/ChangeLog 2015-04-16 03:57:51 UTC (rev 182879)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Disable "Save to Downloads" option for local files
+ https://bugs.webkit.org/show_bug.cgi?id=143794
+
+ Reviewed by Tim Horton.
+
+ Disable the Image and Media download options if the download
+ target is a local file. We can only download web resources;
+ anything else is actually a no-op.
+
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::checkOrEnableIfNeeded): Disable
+ menu item if appropriate.
+
</ins><span class="cx"> 2015-04-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a console message when a stylesheet is not parsed due to invalid MIME type
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (182878 => 182879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2015-04-16 03:40:14 UTC (rev 182878)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2015-04-16 03:57:51 UTC (rev 182879)
</span><span class="lines">@@ -1334,12 +1334,17 @@
</span><span class="cx"> case ContextMenuItemTagDownloadLinkToDisk:
</span><span class="cx"> case ContextMenuItemTagCopyLinkToClipboard:
</span><span class="cx"> case ContextMenuItemTagOpenImageInNewWindow:
</span><del>- case ContextMenuItemTagDownloadImageToDisk:
</del><span class="cx"> case ContextMenuItemTagCopyImageToClipboard:
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="cx"> case ContextMenuItemTagCopyImageUrlToClipboard:
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><ins>+ case ContextMenuItemTagDownloadImageToDisk:
+#if PLATFORM(MAC)
+ if (WebCore::protocolIs(m_context.hitTestResult().absoluteImageURL(), "file"))
+ shouldEnable = false;
+#endif
+ break;
</ins><span class="cx"> case ContextMenuItemTagOpenMediaInNewWindow:
</span><span class="cx"> if (m_context.hitTestResult().mediaIsVideo())
</span><span class="cx"> item.setTitle(contextMenuItemTagOpenVideoInNewWindow());
</span><span class="lines">@@ -1351,6 +1356,8 @@
</span><span class="cx"> item.setTitle(contextMenuItemTagDownloadVideoToDisk());
</span><span class="cx"> else
</span><span class="cx"> item.setTitle(contextMenuItemTagDownloadAudioToDisk());
</span><ins>+ if (WebCore::protocolIs(m_context.hitTestResult().absoluteImageURL(), "file"))
+ shouldEnable = false;
</ins><span class="cx"> break;
</span><span class="cx"> case ContextMenuItemTagCopyMediaLinkToClipboard:
</span><span class="cx"> if (m_context.hitTestResult().mediaIsVideo())
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182878 => 182879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-16 03:40:14 UTC (rev 182878)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-16 03:57:51 UTC (rev 182879)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Disable "Save to Downloads" option for local files
+ https://bugs.webkit.org/show_bug.cgi?id=143794
+
+ Reviewed by Tim Horton.
+
+ Disable the Image and Media download options if the download
+ target is a local file. We can only download web resources;
+ anything else is actually a no-op.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForImage]):
+ (-[WebActionMenuController _defaultMenuItemsForVideo]):
+
</ins><span class="cx"> 2015-04-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Mac.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (182878 => 182879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-04-16 03:40:14 UTC (rev 182878)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-04-16 03:57:51 UTC (rev 182879)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -686,6 +686,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><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">@@ -698,6 +699,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><ins>+ enabled = WebCore::protocolIs(_hitTestResult.absoluteMediaURL(), "file");
</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 (182878 => 182879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-16 03:40:14 UTC (rev 182878)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-16 03:57:51 UTC (rev 182879)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Disable "Save to Downloads" option for local files
+ https://bugs.webkit.org/show_bug.cgi?id=143794
+
+ Reviewed by Tim Horton.
+
+ Disable the Image and Media download options if the download
+ target is a local file. We can only download web resources;
+ anything else is actually a no-op.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForVideo]):
+ (-[WKActionMenuController _defaultMenuItemsForImage]):
+
</ins><span class="cx"> 2015-04-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make websiteDataStore on WKWebViewConfiguration public
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (182878 => 182879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2015-04-16 03:40:14 UTC (rev 182878)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2015-04-16 03:57:51 UTC (rev 182879)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -590,6 +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><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">@@ -620,6 +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><ins>+ enabled = WebCore::protocolIs(hitTestResult->absoluteMediaURL(), "file");
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span></span></pre>
</div>
</div>
</body>
</html>