<!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>[162647] tags/Safari-538.13</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/162647">162647</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 14:54:39 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout 161455.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53813LayoutTestsChangeLog">tags/Safari-538.13/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari53813LayoutTestsplatformmacTestExpectations">tags/Safari-538.13/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#tagsSafari53813SourceWebCoreChangeLog">tags/Safari-538.13/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari53813SourceWebCorehtmlHTMLMediaElementcpp">tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#tagsSafari53813SourceWebCorehtmlHTMLMediaElementh">tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#tagsSafari53813SourceWebCoreloaderResourceLoadNotifiercpp">tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.cpp</a></li>
<li><a href="#tagsSafari53813SourceWebCoreloaderResourceLoadNotifierh">tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.h</a></li>
<li><a href="#tagsSafari53813SourceWebCoreplatformgraphicsMediaPlayercpp">tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#tagsSafari53813SourceWebCoreplatformgraphicsMediaPlayerh">tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#tagsSafari53813SourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#tagsSafari53813SourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#tagsSafari53813LayoutTestshttptestsmediaresourcesvideoauthphp">tags/Safari-538.13/LayoutTests/http/tests/media/resources/video-auth.php</a></li>
<li><a href="#tagsSafari53813LayoutTestshttptestsmediavideoauthexpectedtxt">tags/Safari-538.13/LayoutTests/http/tests/media/video-auth-expected.txt</a></li>
<li><a href="#tagsSafari53813LayoutTestshttptestsmediavideoauthhtml">tags/Safari-538.13/LayoutTests/http/tests/media/video-auth.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53813LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/LayoutTests/ChangeLog (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/LayoutTests/ChangeLog 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/LayoutTests/ChangeLog 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-01-23 Lucas Forschler <lforschler@apple.com>
+
+ Rollout r161455
+
</ins><span class="cx"> 2014-01-22 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WebKit concatenates name of all toolbar buttons in the apple.com video player
</span></span></pre></div>
<a id="tagsSafari53813LayoutTestshttptestsmediaresourcesvideoauthphp"></a>
<div class="delfile"><h4>Deleted: tags/Safari-538.13/LayoutTests/http/tests/media/resources/video-auth.php (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/LayoutTests/http/tests/media/resources/video-auth.php 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/LayoutTests/http/tests/media/resources/video-auth.php 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-<?php
-
- $ua = $_SERVER["HTTP_USER_AGENT"];
-
- header("Cache-Control: no-store");
- header("Connection: close");
- if (!isset($_SERVER['PHP_AUTH_USER'])) {
- header("WWW-authenticate: Basic realm=\"" . $_SERVER['REQUEST_URI'] . "\"");
- header('HTTP/1.0 401 Unauthorized');
- exit;
- }
-
- $fileName = $_GET["name"];
- $type = $_GET["type"];
-
- $_GET = array();
- $_GET['name'] = $fileName;
- $_GET['type'] = $type;
- @include("./serve-video.php");
-?>
</del></span></pre></div>
<a id="tagsSafari53813LayoutTestshttptestsmediavideoauthexpectedtxt"></a>
<div class="delfile"><h4>Deleted: tags/Safari-538.13/LayoutTests/http/tests/media/video-auth-expected.txt (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/LayoutTests/http/tests/media/video-auth-expected.txt 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/LayoutTests/http/tests/media/video-auth-expected.txt 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-http://127.0.0.1:8000/media/resources/video-auth.php?name=test.mp4&type=video/mp4 - didReceiveAuthenticationChallenge - Responding with username:password
-
-Tests that the media player sends authorization credentials when requesting a media file.
-EVENT(canplay)
-END OF TEST
-
</del></span></pre></div>
<a id="tagsSafari53813LayoutTestshttptestsmediavideoauthhtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-538.13/LayoutTests/http/tests/media/video-auth.html (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/LayoutTests/http/tests/media/video-auth.html 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/LayoutTests/http/tests/media/video-auth.html 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-<html>
- <head>
- <script src=../../media-resources/video-test.js></script>
- <script src=../../media-resources/media-file.js></script>
- <script>
-
- if (window.testRunner) {
- testRunner.setHandlesAuthenticationChallenges(true);
- testRunner.setAuthenticationUsername("username");
- testRunner.setAuthenticationPassword("password");
- }
-
- function loadMediaFrame()
- {
- findMediaElement();
-
- var movie = findMediaFile('video', 'test');
- var type = mimeTypeForExtension(movie.split('.').pop());
- var frame = document.createElement('iframe');
- frame.width = 0;
- frame.height = 0;
- frame.addEventListener('load', function () {
- source = document.getElementById('source');
- source.src = 'http://127.0.0.1:8000/media/resources/video-auth.php?name=' + movie + '&type=' + type;
- source.type = type;
-
- waitForEventAndFail('error');
- waitForEventAndEnd('canplay');
- video.load();
- });
-
- frame.src = "data:text/html,<b>test</b>";
- document.body.appendChild(frame);
- }
- </script>
- </head>
-
- <body onload="loadMediaFrame()">
- <video id="video">
- <source id="source">
- </video>
- <br>
- Tests that the media player sends authorization credentials when requesting a media file.
- </body>
-</html>
</del></span></pre></div>
<a id="tagsSafari53813LayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/LayoutTests/platform/mac/TestExpectations (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/LayoutTests/platform/mac/TestExpectations 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/LayoutTests/platform/mac/TestExpectations 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -565,9 +565,6 @@
</span><span class="cx"> fast/events/show-modal-dialog-onblur-onfocus.html
</span><span class="cx"> platform/mac/fast/forms/listbox-scrollbar-hit-test.html
</span><span class="cx">
</span><del>-# Multiple non contiguous selection with keyboard not enabled on mac
-webkit.org/b/15816 fast/forms/listbox-non-contiguous-keyboard-selection.html [ Skip ]
-
</del><span class="cx"> # <rdar://problem/11224894> Several Japanese vertical text tests failing on Mountain Lion
</span><span class="cx"> fast/dynamic/text-combine.html
</span><span class="cx"> fast/repaint/japanese-rl-selection-clear.html
</span><span class="lines">@@ -615,11 +612,6 @@
</span><span class="cx"> compositing/overflow/updating-scrolling-content.html
</span><span class="cx"> compositing/overflow/scrolling-without-painting.html
</span><span class="cx">
</span><del>-# Blend mode result is slightly different than the applied formula.
-css3/compositing/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
-css3/compositing/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
-css3/compositing/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
-
</del><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=110871
</span><span class="cx"> compositing/overlap-blending/reflection-opacity-huge.html
</span><span class="cx">
</span><span class="lines">@@ -699,6 +691,9 @@
</span><span class="cx">
</span><span class="cx"> # Currently working on 1.0.2 conformance, skip currently known failing tests, <rdar://problem/12099869>
</span><span class="cx"> webgl/1.0.2/conformance/glsl/misc/shaders-with-varyings.html [ Failure ]
</span><ins>+webgl/1.0.2/conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html [ Failure ]
+webgl/1.0.2/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html [ Failure ]
+webgl/1.0.2/conformance/typedarrays/data-view-test.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> # Test is faulty, skipping for now
</span><span class="cx"> webgl/1.0.2/conformance/ogles/GL/build/build_009_to_016.html [ Failure ]
</span><span class="lines">@@ -923,8 +918,6 @@
</span><span class="cx"> webkit.org/b/87541 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/87541 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Failure Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/126624 [ MountainLion ] webgl/1.0.2/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html [ Pass Failure Timeout ]
-
</del><span class="cx"> webkit.org/b/92464 [ Debug ] fast/events/tabindex-focus-blur-all.html [ Crash Pass ]
</span><span class="cx">
</span><span class="cx"> # css3-conditionals support is not yet enabled.
</span><span class="lines">@@ -1319,30 +1312,4 @@
</span><span class="cx">
</span><span class="cx"> # GL Scissors don't work properly in Mountain Lion.
</span><span class="cx"> webkit.org/b/126455 [ MountainLion ] webgl/1.0.2/conformance/rendering/gl-scissor-test.html [ Failure ]
</span><del>-webkit.org/b/126586 [ Mavericks Debug ] webgl/1.0.2/conformance/rendering/gl-scissor-test.html [ Pass Failure ]
-
-# HTTP Auth in Media is not supported in Mavericks and Mountain Lion
-webkit.org/b/40382 http/tests/media/video-auth.html [ Skip ]
-
-webkit.org/b/52016 http/tests/xmlhttprequest/xmlhttprequest-50ms-download-dispatch.html [ Pass Failure Timeout ]
-
-# Crashes in garbage collection code.
-webkit.org/b/117756 media/track/media-element-enqueue-event-crash.html [ Skip ]
-
-# Subpixel failures
-# Subpixel: position dependent size: snapSizeToPixel()
-webkit.org/b/126889 fast/forms/input-widths.html [ Failure ]
-webkit.org/b/126889 fast/forms/number/number-size.html [ Failure ]
-
-# Subpixel: off-by-1 pixel rendering on mathml
-webkit.org/b/126897 mathml/presentation/bug95015.html [ ImageOnlyFailure ]
-
-# Subpixel: -webkit-flex off-by-one px
-webkit.org/b/126898 css3/flexbox/image-percent-max-height.html [ ImageOnlyFailure ]
-
-# Subpixel: misplaced zoomed svg content.
-webkit.org/b/126900 svg/zoom/page/zoom-zoom-coords.xhtml [ Failure ]
-
-webkit.org/b/35297 media/video-display-aspect-ratio.html [ Pass Failure ]
-
-webkit.org/b/127310 svg/filters/feComponentTransfer-style-crash.xhtml [ Pass Failure Timeout ]
</del><ins>+webkit.org/b/126586 [ Mavericks Debug] webgl/1.0.2/conformance/rendering/gl-scissor-test.html [ Pass Failure ]
</ins></span></pre></div>
<a id="tagsSafari53813SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/ChangeLog (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/ChangeLog 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/ChangeLog 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2014-01-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Rollout r161455
+
+2014-01-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Rollout r161778
</span><span class="cx">
</span><span class="cx"> 2014-01-22 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.cpp (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> #include "MediaSessionManager.h"
</span><span class="cx"> #include "PageActivityAssertionToken.h"
</span><span class="cx"> #include "PageGroup.h"
</span><del>-#include "ProgressTracker.h"
</del><span class="cx"> #include "RenderVideo.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="lines">@@ -5600,27 +5599,6 @@
</span><span class="cx"> return mediaPlayerOwningDocument()->cachedResourceLoader();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMediaElement::mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge& challenge)
-{
- Frame* frame = document().frame();
- if (!frame)
- return false;
-
- Page* page = frame->page();
- if (!page)
- return false;
-
- ResourceRequest request(m_currentSrc);
- ResourceLoadNotifier& notifier = frame->loader().notifier();
- DocumentLoader* documentLoader = document().loader();
- unsigned long identifier = page->progress().createUniqueIdentifier();
-
- notifier.assignIdentifierToInitialRequest(identifier, documentLoader, request);
- notifier.didReceiveAuthenticationChallenge(identifier, documentLoader, challenge);
-
- return true;
-}
-
</del><span class="cx"> void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
</span><span class="cx"> {
</span><span class="cx"> m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForLoad);
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.h (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.h 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/html/HTMLMediaElement.h 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -561,8 +561,6 @@
</span><span class="cx"> virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) override;
-
</del><span class="cx"> void loadTimerFired(Timer<HTMLMediaElement>&);
</span><span class="cx"> void progressEventTimerFired(Timer<HTMLMediaElement>&);
</span><span class="cx"> void playbackProgressTimerFired(Timer<HTMLMediaElement>&);
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCoreloaderResourceLoadNotifiercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.cpp (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.cpp 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.cpp 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -53,24 +53,14 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoadNotifier::didReceiveAuthenticationChallenge(ResourceLoader* loader, const AuthenticationChallenge& currentWebChallenge)
</span><span class="cx"> {
</span><del>- didReceiveAuthenticationChallenge(loader->identifier(), loader->documentLoader(), currentWebChallenge);
</del><ins>+ m_frame.loader().client().dispatchDidReceiveAuthenticationChallenge(loader->documentLoader(), loader->identifier(), currentWebChallenge);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadNotifier::didReceiveAuthenticationChallenge(unsigned long identifier, DocumentLoader* loader, const AuthenticationChallenge& currentWebChallenge)
-{
- m_frame.loader().client().dispatchDidReceiveAuthenticationChallenge(loader, identifier, currentWebChallenge);
-}
-
</del><span class="cx"> void ResourceLoadNotifier::didCancelAuthenticationChallenge(ResourceLoader* loader, const AuthenticationChallenge& currentWebChallenge)
</span><span class="cx"> {
</span><del>- didCancelAuthenticationChallenge(loader->identifier(), loader->documentLoader(), currentWebChallenge);
</del><ins>+ m_frame.loader().client().dispatchDidCancelAuthenticationChallenge(loader->documentLoader(), loader->identifier(), currentWebChallenge);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadNotifier::didCancelAuthenticationChallenge(unsigned long identifier, DocumentLoader* loader, const AuthenticationChallenge& currentWebChallenge)
-{
- m_frame.loader().client().dispatchDidCancelAuthenticationChallenge(loader, identifier, currentWebChallenge);
-}
-
</del><span class="cx"> void ResourceLoadNotifier::willSendRequest(ResourceLoader* loader, ResourceRequest& clientRequest, const ResourceResponse& redirectResponse)
</span><span class="cx"> {
</span><span class="cx"> m_frame.loader().applyUserAgent(clientRequest);
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCoreloaderResourceLoadNotifierh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.h (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.h 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/loader/ResourceLoadNotifier.h 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -49,9 +49,7 @@
</span><span class="cx"> explicit ResourceLoadNotifier(Frame&);
</span><span class="cx">
</span><span class="cx"> void didReceiveAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
</span><del>- void didReceiveAuthenticationChallenge(unsigned long identifier, DocumentLoader*, const AuthenticationChallenge&);
</del><span class="cx"> void didCancelAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
</span><del>- void didCancelAuthenticationChallenge(unsigned long identifier, DocumentLoader*, const AuthenticationChallenge&);
</del><span class="cx">
</span><span class="cx"> void willSendRequest(ResourceLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
</span><span class="cx"> void didReceiveResponse(ResourceLoader*, const ResourceResponse&);
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.cpp (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -1336,14 +1336,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool MediaPlayer::shouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge& challenge)
-{
- if (!m_mediaPlayerClient)
- return false;
-
- return m_mediaPlayerClient->mediaPlayerShouldWaitForResponseToAuthenticationChallenge(challenge);
-}
-
</del><span class="cx"> void MediaPlayerFactorySupport::callRegisterMediaEngine(MediaEngineRegister registerMediaEngine)
</span><span class="cx"> {
</span><span class="cx"> registerMediaEngine(addMediaEngine);
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.h (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.h 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/platform/graphics/MediaPlayer.h 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AudioSourceProvider;
</span><del>-class AuthenticationChallenge;
</del><span class="cx"> class Document;
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> class HTMLMediaSource;
</span><span class="lines">@@ -258,8 +257,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void textTrackRepresentationBoundsChanged(const IntRect&) { }
</span><span class="cx"> #endif
</span><del>-
- virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) { return false; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaPlayerSupportsTypeClient {
</span><span class="lines">@@ -549,8 +546,6 @@
</span><span class="cx"> double totalFrameDelay();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&);
-
</del><span class="cx"> private:
</span><span class="cx"> MediaPlayer(MediaPlayerClient*);
</span><span class="cx"> MediaPlayerFactory* nextBestMediaEngine(MediaPlayerFactory*) const;
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> OBJC_CLASS AVPlayerLayer;
</span><span class="cx"> OBJC_CLASS AVURLAsset;
</span><span class="cx"> OBJC_CLASS NSArray;
</span><del>-OBJC_CLASS NSURLAuthenticationChallenge;
</del><span class="cx"> OBJC_CLASS WebCoreAVFMovieObserver;
</span><span class="cx"> OBJC_CLASS WebCoreAVFPullDelegate;
</span><span class="cx">
</span><span class="lines">@@ -81,7 +80,6 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE)
</span><span class="cx"> bool shouldWaitForLoadingOfResource(AVAssetResourceLoadingRequest*);
</span><del>- bool shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge*);
</del><span class="cx"> void didCancelLoadingRequest(AVAssetResourceLoadingRequest*);
</span><span class="cx"> void didStopLoadingRequest(AVAssetResourceLoadingRequest *);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari53813SourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (162646 => 162647)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-23 22:45:25 UTC (rev 162646)
+++ tags/Safari-538.13/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-23 22:54:39 UTC (rev 162647)
</span><span class="lines">@@ -29,9 +29,8 @@
</span><span class="cx">
</span><span class="cx"> #import "MediaPlayerPrivateAVFoundationObjC.h"
</span><span class="cx">
</span><del>-#import "AVTrackPrivateAVFObjCImpl.h"
</del><span class="cx"> #import "AudioTrackPrivateAVFObjC.h"
</span><del>-#import "AuthenticationChallenge.h"
</del><ins>+#import "AVTrackPrivateAVFObjCImpl.h"
</ins><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "ExceptionCodePlaceholder.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="lines">@@ -1036,13 +1035,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge* nsChallenge)
-{
- AuthenticationChallenge challenge(nsChallenge);
-
- return player()->shouldWaitForResponseToAuthenticationChallenge(challenge);
-}
-
</del><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::didCancelLoadingRequest(AVAssetResourceLoadingRequest* avRequest)
</span><span class="cx"> {
</span><span class="cx"> String scheme = [[[avRequest request] URL] scheme];
</span><span class="lines">@@ -2075,25 +2067,6 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)resourceLoader:(AVAssetResourceLoader *)resourceLoader shouldWaitForResponseToAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
-{
- UNUSED_PARAM(resourceLoader);
- if (!m_callback)
- return NO;
-
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_callback) {
- [[challenge sender] cancelAuthenticationChallenge:challenge];
- return;
- }
-
- if (!m_callback->shouldWaitForResponseToAuthenticationChallenge(challenge))
- [[challenge sender] cancelAuthenticationChallenge:challenge];
- });
-
- return YES;
-}
-
</del><span class="cx"> - (void)resourceLoader:(AVAssetResourceLoader *)resourceLoader didCancelLoadingRequest:(AVAssetResourceLoadingRequest *)loadingRequest
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(resourceLoader);
</span></span></pre>
</div>
</div>
</body>
</html>