<!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>[176280] branches/safari-600.3-branch/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/176280">176280</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-18 13:01:15 -0800 (Tue, 18 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176108">r176108</a>. rdar://problem/19005904</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageContextMenuControllercpp">branches/safari-600.3-branch/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsMediaPlayercpp">branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsMediaPlayerh">branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsMediaPlayerPrivateh">branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingHitTestResultcpp">branches/safari-600.3-branch/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResultcpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth">branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResultcpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResulth">branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2014-11-18 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176108. rdar://problem/19005904
+
+ 2014-11-13 Eric Carlson <eric.carlson@apple.com>
+
+ Context menus should not offer the "Download video" option for videos that cannot
+ be downloaded
+ https://bugs.webkit.org/show_bug.cgi?id=138530
+ -and corresponding-
+ rdar://problem/18919130
+
+ Reviewed by Tim Horton.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/HTMLMediaElement.h:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::populate):
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::canSaveMediaData):
+ (WebCore::MediaPlayer::supportsSave): Deleted.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::supportsFullscreen):
+ (WebCore::MediaPlayerPrivateInterface::canSaveMediaData):
+ (WebCore::MediaPlayerPrivateInterface::supportsSave): Deleted.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::resolvedURL):
+ (WebCore::MediaPlayerPrivateAVFoundation::canSaveMediaData):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::resolvedURL):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::canSaveMediaData):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::canSaveMediaData):
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::isDownloadableMedia):
+
+2014-11-18 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r175765. rdar://problem/19005917
</span><span class="cx">
</span><span class="cx"> 2014-11-07 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -2295,11 +2295,6 @@
</span><span class="cx"> m_playedTimeRanges->add(start, end);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMediaElement::supportsSave() const
-{
- return m_player ? m_player->supportsSave() : false;
-}
-
</del><span class="cx"> bool HTMLMediaElement::supportsScanning() const
</span><span class="cx"> {
</span><span class="cx"> return m_player ? m_player->supportsScanning() : false;
</span><span class="lines">@@ -6060,9 +6055,17 @@
</span><span class="cx"> void HTMLMediaElement::setShouldBufferData(bool shouldBuffer)
</span><span class="cx"> {
</span><span class="cx"> if (m_player)
</span><del>- return m_player->setShouldBufferData(shouldBuffer);
</del><ins>+ m_player->setShouldBufferData(shouldBuffer);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
+bool HTMLMediaElement::canSaveMediaData() const
+{
+ if (m_player)
+ return m_player->canSaveMediaData();
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/html/HTMLMediaElement.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -114,9 +114,10 @@
</span><span class="cx"> // Eventually overloaded in HTMLVideoElement
</span><span class="cx"> virtual bool supportsFullscreen() const override { return false; };
</span><span class="cx">
</span><del>- virtual bool supportsSave() const;
</del><span class="cx"> virtual bool supportsScanning() const override;
</span><del>-
</del><ins>+
+ bool canSaveMediaData() const;
+
</ins><span class="cx"> virtual bool doesHaveAttribute(const AtomicString&, AtomicString* value = nullptr) const override;
</span><span class="cx">
</span><span class="cx"> PlatformMedia platformMedia() const;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/ContextMenuController.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/ContextMenuController.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/page/ContextMenuController.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> appendItem(*separatorItem(), m_contextMenu.get());
</span><span class="cx"> appendItem(CopyMediaLinkItem, m_contextMenu.get());
</span><span class="cx"> appendItem(OpenMediaInNewWindowItem, m_contextMenu.get());
</span><del>- if (loader.client().canHandleRequest(ResourceRequest(mediaURL)))
</del><ins>+ if (m_context.hitTestResult().isDownloadableMedia() && loader.client().canHandleRequest(ResourceRequest(mediaURL)))
</ins><span class="cx"> appendItem(DownloadMediaItem, m_contextMenu.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -557,9 +557,9 @@
</span><span class="cx"> return m_private->supportsFullscreen();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlayer::supportsSave() const
</del><ins>+bool MediaPlayer::canSaveMediaData() const
</ins><span class="cx"> {
</span><del>- return m_private->supportsSave();
</del><ins>+ return m_private->canSaveMediaData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayer::supportsScanning() const
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -303,8 +303,8 @@
</span><span class="cx"> static bool supportsKeySystem(const String& keySystem, const String& mimeType);
</span><span class="cx">
</span><span class="cx"> bool supportsFullscreen() const;
</span><del>- bool supportsSave() const;
</del><span class="cx"> bool supportsScanning() const;
</span><ins>+ bool canSaveMediaData() const;
</ins><span class="cx"> bool requiresImmediateCompositing() const;
</span><span class="cx"> bool doesHaveAttribute(const AtomicString&, AtomicString* value = nullptr) const;
</span><span class="cx"> PlatformMedia platformMedia() const;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -69,10 +69,11 @@
</span><span class="cx"> virtual void setShouldBufferData(bool) { }
</span><span class="cx">
</span><span class="cx"> virtual bool supportsFullscreen() const { return false; }
</span><del>- virtual bool supportsSave() const { return false; }
</del><span class="cx"> virtual bool supportsScanning() const { return false; }
</span><span class="cx"> virtual bool requiresImmediateCompositing() const { return false; }
</span><span class="cx">
</span><ins>+ virtual bool canSaveMediaData() const { return false; }
+
</ins><span class="cx"> virtual IntSize naturalSize() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool hasVideo() const = 0;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -1069,6 +1069,30 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+URL MediaPlayerPrivateAVFoundation::resolvedURL() const
+{
+ if (!m_assetURL.length())
+ return URL();
+
+ return URL(ParsedURLString, m_assetURL);
+}
+
+bool MediaPlayerPrivateAVFoundation::canSaveMediaData() const
+{
+ URL url = resolvedURL();
+
+ if (url.isLocalFile())
+ return true;
+
+ if (!url.protocolIsInHTTPFamily())
+ return false;
+
+ if (isLiveStream())
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -196,6 +196,7 @@
</span><span class="cx"> virtual void acceleratedRenderingStateChanged() override;
</span><span class="cx"> virtual bool shouldMaintainAspectRatio() const override { return m_shouldMaintainAspectRatio; }
</span><span class="cx"> virtual void setShouldMaintainAspectRatio(bool) override;
</span><ins>+ virtual bool canSaveMediaData() const override;
</ins><span class="cx">
</span><span class="cx"> virtual MediaPlayer::MovieLoadType movieLoadType() const;
</span><span class="cx"> virtual void prepareForRendering();
</span><span class="lines">@@ -309,6 +310,8 @@
</span><span class="cx"> void clearTextTracks();
</span><span class="cx"> Vector<RefPtr<InbandTextTrackPrivateAVF>> m_textTracks;
</span><span class="cx">
</span><ins>+virtual URL resolvedURL() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> MediaPlayer* m_player;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -270,6 +270,8 @@
</span><span class="cx"> virtual double maxFastForwardRate() const override { return m_cachedCanPlayFastForward ? std::numeric_limits<double>::infinity() : 2.0; }
</span><span class="cx"> virtual double minFastReverseRate() const override { return m_cachedCanPlayFastReverse ? -std::numeric_limits<double>::infinity() : 0.0; }
</span><span class="cx">
</span><ins>+ virtual URL resolvedURL() const override;
+
</ins><span class="cx"> WeakPtrFactory<MediaPlayerPrivateAVFoundationObjC> m_weakPtrFactory;
</span><span class="cx">
</span><span class="cx"> RetainPtr<AVURLAsset> m_avAsset;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -2643,6 +2643,14 @@
</span><span class="cx"> m_cachedCanPlayFastReverse = newValue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+URL MediaPlayerPrivateAVFoundationObjC::resolvedURL() const
+{
+ if (!m_avAsset)
+ return MediaPlayerPrivateAVFoundation::resolvedURL();
+
+ return URL([m_avAsset resolvedURL]);
+}
+
</ins><span class="cx"> NSArray* assetMetadataKeyNames()
</span><span class="cx"> {
</span><span class="cx"> static NSArray* keys;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -1920,6 +1920,20 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaPlayerPrivateGStreamer::canSaveMediaData() const
+{
+ if (isLiveStream())
+ return false;
+
+ if (m_url.isLocalFile())
+ return true;
+
+ if (m_url.protocolIsInHTTPFamily())
+ return true;
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif // USE(GSTREAMER)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -164,6 +164,7 @@
</span><span class="cx"> virtual String engineDescription() const { return "GStreamer"; }
</span><span class="cx"> virtual bool isLiveStream() const { return m_isStreaming; }
</span><span class="cx"> virtual bool didPassCORSAccessCheck() const;
</span><ins>+ virtual bool canSaveMediaData() const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> GRefPtr<GstElement> m_playBin;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -140,6 +140,8 @@
</span><span class="cx"> bool hasSingleSecurityOrigin() const;
</span><span class="cx"> MediaPlayer::MovieLoadType movieLoadType() const;
</span><span class="cx">
</span><ins>+ virtual bool canSaveMediaData() const override;
+
</ins><span class="cx"> void createQTMovie(const String& url);
</span><span class="cx"> void createQTMovie(NSURL *, NSDictionary *movieAttributes);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -1664,6 +1664,27 @@
</span><span class="cx"> [m_qtMovie.get() setAttribute:[NSNumber numberWithBool:!privateBrowsing] forKey:@"QTMovieAllowPersistentCacheAttribute"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaPlayerPrivateQTKit::canSaveMediaData() const
+{
+ URL url;
+
+ if (duration() >= std::numeric_limits<float>::infinity())
+ return false;
+
+ if (m_qtMovie)
+ url = URL(wkQTMovieResolvedURL(m_qtMovie.get()));
+ else
+ url = URL(ParsedURLString, m_movieURL);
+
+ if (url.isLocalFile())
+ return true;
+
+ if (url.protocolIsInHTTPFamily())
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> @implementation WebCoreMovieObserver
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/HitTestResult.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/HitTestResult.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/HitTestResult.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -507,9 +507,12 @@
</span><span class="cx">
</span><span class="cx"> bool HitTestResult::isDownloadableMedia() const
</span><span class="cx"> {
</span><del>- // FIXME: We should actually answer instead of always returning true for media elements.
- // https://bugs.webkit.org/show_bug.cgi?id=138530
- return mediaElement() ? true : false;
</del><ins>+#if ENABLE(VIDEO)
+ if (HTMLMediaElement* mediaElt = mediaElement())
+ return mediaElt->canSaveMediaData();
+#endif
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL HitTestResult::absoluteLinkURL() const
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-11-18 Dana Burkart <dburkart@apple.com>
+
+ Merge r176108. rdar://problem/19005904
+
+ 2014-11-13 Eric Carlson <eric.carlson@apple.com>
+
+ Context menus should not offer the "Download video" option for videos that cannot
+ be downloaded
+ https://bugs.webkit.org/show_bug.cgi?id=138530
+ -and corresponding-
+ rdar://problem/18919130
+
+ Reviewed by Tim Horton.
+
+ Expose isDownloadableMedia() to the InjectedBundleHitTestResult.
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+ (WKBundleHitTestResultIsDownloadableMedia):
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+ (WebKit::InjectedBundleHitTestResult::isDownloadableMedia):
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
</ins><span class="cx"> 2014-11-17 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176150. <rdar://problem/18982046>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -84,6 +84,11 @@
</span><span class="cx"> return toImpl(hitTestResultRef)->mediaHasAudio();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WKBundleHitTestResultIsDownloadableMedia(WKBundleHitTestResultRef hitTestResultRef)
+{
+ return toImpl(hitTestResultRef)->isDownloadableMedia();
+}
+
</ins><span class="cx"> WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResultRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(hitTestResultRef)->mediaType());
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> WK_EXPORT WKURLRef WKBundleHitTestResultCopyAbsoluteMediaURL(WKBundleHitTestResultRef hitTestResult);
</span><span class="cx"> WK_EXPORT bool WKBundleHitTestResultMediaIsInFullscreen(WKBundleHitTestResultRef hitTestResult);
</span><span class="cx"> WK_EXPORT bool WKBundleHitTestResultMediaHasAudio(WKBundleHitTestResultRef hitTestResult);
</span><ins>+WK_EXPORT bool WKBundleHitTestResultIsDownloadableMedia(WKBundleHitTestResultRef hitTestResultRef);
</ins><span class="cx"> WK_EXPORT WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResult);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResult);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -103,6 +103,11 @@
</span><span class="cx"> return m_hitTestResult.mediaHasAudio();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool InjectedBundleHitTestResult::isDownloadableMedia() const
+{
+ return m_hitTestResult.isDownloadableMedia();
+}
+
</ins><span class="cx"> BundleHitTestResultMediaType InjectedBundleHitTestResult::mediaType() const
</span><span class="cx"> {
</span><span class="cx"> #if !ENABLE(VIDEO)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (176279 => 176280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2014-11-18 20:59:40 UTC (rev 176279)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2014-11-18 21:01:15 UTC (rev 176280)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> String absoluteMediaURL() const;
</span><span class="cx"> bool mediaIsInFullscreen() const;
</span><span class="cx"> bool mediaHasAudio() const;
</span><ins>+ bool isDownloadableMedia() const;
</ins><span class="cx"> BundleHitTestResultMediaType mediaType() const;
</span><span class="cx">
</span><span class="cx"> String linkLabel() const;
</span></span></pre>
</div>
</div>
</body>
</html>