<!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>[162836] trunk/Source/WebCore</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/162836">162836</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 07:05:44 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge Chromium TextTrack cleanups
https://bugs.webkit.org/show_bug.cgi?id=127483
Reviewed by Darin Adler.
Merge some TextTrack cleanups:
https://chromium.googlesource.com/chromium/blink/+/b571b9fbc6e62e05aa77a402cf8f447e681b8ee3
https://chromium.googlesource.com/chromium/blink/+/6b1940151258150ea01bcf21ebfd958e2af247f4
https://chromium.googlesource.com/chromium/blink/+/397c2a2d9416f5c0d79bca22d6979f174eefcce2
https://chromium.googlesource.com/chromium/blink/+/f42ad93e25c6310b2b0327ab7ce5d82d3c4a6c1b
https://chromium.googlesource.com/chromium/blink/+/d55b52b53b7da05bba5fe378a4278250b9347430
https://chromium.googlesource.com/chromium/blink/+/cac766ecaaac477a08879f0b3157d0327cc75d96
https://chromium.googlesource.com/chromium/blink/+/6197ce278696cdd52fc2ad81893f369492468ca0
* html/HTMLTrackElement.cpp:
(WebCore::HTMLTrackElement::loadTimerFired): Remove the LoadableTextTrack* parameter, it isn't used.
(WebCore::HTMLTrackElement::didCompleteLoad): Ditto.
* html/HTMLTrackElement.h: didCompleteLoad doesn't need to be virtual.
* html/track/LoadableTextTrack.cpp:
(WebCore::LoadableTextTrack::loadTimerFired): Pass a reference, not a pointer.
(WebCore::LoadableTextTrack::cueLoadingStarted): Removed, it wasn't used.
(WebCore::LoadableTextTrack::cueLoadingCompleted): Pass a reference, not a pointer.
* html/track/LoadableTextTrack.h: Delete LoadableTextTrackClient, it is no longer used.
* loader/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::TextTrackLoader): Take a TextTrackLoaderClient reference.
(WebCore::TextTrackLoader::~TextTrackLoader): Rename m_cachedCueData m_resource.
(WebCore::TextTrackLoader::cueLoadTimerFired): m_client is a reference.
(WebCore::TextTrackLoader::cancelLoad): m_cachedCueData -> m_resource.
(WebCore::TextTrackLoader::processNewCueData): Ditto.
(WebCore::TextTrackLoader::deprecatedDidReceiveCachedResource): Ditto.
(WebCore::TextTrackLoader::notifyFinished): Ditto.
(WebCore::TextTrackLoader::load): shouldLoadCues was removed from the client interface because
the only implementation always returned true.
(WebCore::TextTrackLoader::newRegionsParsed): m_client is a reference
* loader/TextTrackLoader.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::canRequest): Remove an outdated comment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTrackElementcpp">trunk/Source/WebCore/html/HTMLTrackElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTrackElementh">trunk/Source/WebCore/html/HTMLTrackElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackcpp">trunk/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackh">trunk/Source/WebCore/html/track/LoadableTextTrack.h</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoaderh">trunk/Source/WebCore/loader/TextTrackLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-01-24 Eric Carlson <eric.carlson@apple.com>
+
+ Merge Chromium TextTrack cleanups
+ https://bugs.webkit.org/show_bug.cgi?id=127483
+
+ Reviewed by Darin Adler.
+
+ Merge some TextTrack cleanups:
+ https://chromium.googlesource.com/chromium/blink/+/b571b9fbc6e62e05aa77a402cf8f447e681b8ee3
+ https://chromium.googlesource.com/chromium/blink/+/6b1940151258150ea01bcf21ebfd958e2af247f4
+ https://chromium.googlesource.com/chromium/blink/+/397c2a2d9416f5c0d79bca22d6979f174eefcce2
+ https://chromium.googlesource.com/chromium/blink/+/f42ad93e25c6310b2b0327ab7ce5d82d3c4a6c1b
+ https://chromium.googlesource.com/chromium/blink/+/d55b52b53b7da05bba5fe378a4278250b9347430
+ https://chromium.googlesource.com/chromium/blink/+/cac766ecaaac477a08879f0b3157d0327cc75d96
+ https://chromium.googlesource.com/chromium/blink/+/6197ce278696cdd52fc2ad81893f369492468ca0
+
+ * html/HTMLTrackElement.cpp:
+ (WebCore::HTMLTrackElement::loadTimerFired): Remove the LoadableTextTrack* parameter, it isn't used.
+ (WebCore::HTMLTrackElement::didCompleteLoad): Ditto.
+ * html/HTMLTrackElement.h: didCompleteLoad doesn't need to be virtual.
+
+ * html/track/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::loadTimerFired): Pass a reference, not a pointer.
+ (WebCore::LoadableTextTrack::cueLoadingStarted): Removed, it wasn't used.
+ (WebCore::LoadableTextTrack::cueLoadingCompleted): Pass a reference, not a pointer.
+ * html/track/LoadableTextTrack.h: Delete LoadableTextTrackClient, it is no longer used.
+
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::TextTrackLoader): Take a TextTrackLoaderClient reference.
+ (WebCore::TextTrackLoader::~TextTrackLoader): Rename m_cachedCueData m_resource.
+ (WebCore::TextTrackLoader::cueLoadTimerFired): m_client is a reference.
+ (WebCore::TextTrackLoader::cancelLoad): m_cachedCueData -> m_resource.
+ (WebCore::TextTrackLoader::processNewCueData): Ditto.
+ (WebCore::TextTrackLoader::deprecatedDidReceiveCachedResource): Ditto.
+ (WebCore::TextTrackLoader::notifyFinished): Ditto.
+ (WebCore::TextTrackLoader::load): shouldLoadCues was removed from the client interface because
+ the only implementation always returned true.
+ (WebCore::TextTrackLoader::newRegionsParsed): m_client is a reference
+ * loader/TextTrackLoader.h:
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::canRequest): Remove an outdated comment.
+
</ins><span class="cx"> 2014-01-27 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Disable accessibility after every test run
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTrackElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTrackElement.cpp 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -213,15 +213,15 @@
</span><span class="cx">
</span><span class="cx"> // 8. If the track element's parent is a media element then let CORS mode be the state of the parent media
</span><span class="cx"> // element's crossorigin content attribute. Otherwise, let CORS mode be No CORS.
</span><del>- if (!canLoadUrl(url)) {
- didCompleteLoad(&ensureTrack(), HTMLTrackElement::Failure);
</del><ins>+ if (!canLoadURL(url)) {
+ didCompleteLoad(HTMLTrackElement::Failure);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ensureTrack().scheduleLoad(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLTrackElement::canLoadUrl(const URL& url)
</del><ins>+bool HTMLTrackElement::canLoadURL(const URL& url)
</ins><span class="cx"> {
</span><span class="cx"> if (!RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
</span><span class="cx"> return false;
</span><span class="lines">@@ -239,14 +239,14 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!document().contentSecurityPolicy()->allowMediaFromSource(url)) {
</span><del>- LOG(Media, "HTMLTrackElement::canLoadUrl(%s) -> rejected by Content Security Policy", urlForLoggingTrack(url).utf8().data());
</del><ins>+ LOG(Media, "HTMLTrackElement::canLoadURL(%s) -> rejected by Content Security Policy", urlForLoggingTrack(url).utf8().data());
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return dispatchBeforeLoadEvent(url.string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTrackElement::didCompleteLoad(LoadableTextTrack*, LoadStatus status)
</del><ins>+void HTMLTrackElement::didCompleteLoad(LoadStatus status)
</ins><span class="cx"> {
</span><span class="cx"> // 4.8.10.12.3 Sourcing out-of-band text tracks (continued)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTrackElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTrackElement.h (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTrackElement.h 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/html/HTMLTrackElement.h 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void scheduleLoad();
</span><span class="cx">
</span><span class="cx"> enum LoadStatus { Failure, Success };
</span><del>- virtual void didCompleteLoad(LoadableTextTrack*, LoadStatus);
</del><ins>+ void didCompleteLoad(LoadStatus);
</ins><span class="cx">
</span><span class="cx"> const AtomicString& mediaElementCrossOriginAttribute() const;
</span><span class="cx">
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) override;
</span><span class="cx">
</span><span class="cx"> LoadableTextTrack& ensureTrack();
</span><del>- virtual bool canLoadUrl(const URL&);
</del><ins>+ bool canLoadURL(const URL&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<LoadableTextTrack> m_track;
</span><span class="cx"> Timer<HTMLTrackElement> m_loadTimer;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -94,9 +94,9 @@
</span><span class="cx"> // 4. Download: If URL is not the empty string, perform a potentially CORS-enabled fetch of URL, with the
</span><span class="cx"> // mode being the state of the media element's crossorigin content attribute, the origin being the
</span><span class="cx"> // origin of the media element's Document, and the default origin behaviour set to fail.
</span><del>- m_loader = TextTrackLoader::create(this, static_cast<ScriptExecutionContext*>(&m_trackElement->document()));
</del><ins>+ m_loader = TextTrackLoader::create(*this, static_cast<ScriptExecutionContext*>(&m_trackElement->document()));
</ins><span class="cx"> if (!m_loader->load(m_url, m_trackElement->mediaElementCrossOriginAttribute()))
</span><del>- m_trackElement->didCompleteLoad(this, HTMLTrackElement::Failure);
</del><ins>+ m_trackElement->didCompleteLoad(HTMLTrackElement::Failure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LoadableTextTrack::newCuesAvailable(TextTrackLoader* loader)
</span><span class="lines">@@ -118,11 +118,6 @@
</span><span class="cx"> client()->textTrackAddCues(this, m_cues.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LoadableTextTrack::cueLoadingStarted(TextTrackLoader* loader)
-{
- ASSERT_UNUSED(loader, m_loader == loader);
-}
-
</del><span class="cx"> void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadingFailed)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(loader, m_loader == loader);
</span><span class="lines">@@ -130,7 +125,7 @@
</span><span class="cx"> if (!m_trackElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_trackElement->didCompleteLoad(this, loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
</del><ins>+ m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.h 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.h 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -37,14 +37,6 @@
</span><span class="cx"> class HTMLTrackElement;
</span><span class="cx"> class LoadableTextTrack;
</span><span class="cx">
</span><del>-class LoadableTextTrackClient : public TextTrackClient {
-public:
- virtual ~LoadableTextTrackClient() { }
-
- virtual bool canLoadUrl(LoadableTextTrack*, const URL&) { return false; }
- virtual void loadingCompleted(LoadableTextTrack*, bool /* loadingFailed */) { }
-};
-
</del><span class="cx"> class LoadableTextTrack : public TextTrack, private TextTrackLoaderClient {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<LoadableTextTrack> create(HTMLTrackElement* track, const String& kind, const String& label, const String& language)
</span><span class="lines">@@ -69,9 +61,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // TextTrackLoaderClient
</span><del>- virtual bool shouldLoadCues(TextTrackLoader*) override { return true; }
</del><span class="cx"> virtual void newCuesAvailable(TextTrackLoader*) override;
</span><del>- virtual void cueLoadingStarted(TextTrackLoader*) override;
</del><span class="cx"> virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) override;
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> virtual void newRegionsAvailable(TextTrackLoader*);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, ScriptExecutionContext* context)
</del><ins>+TextTrackLoader::TextTrackLoader(TextTrackLoaderClient& client, ScriptExecutionContext* context)
</ins><span class="cx"> : m_client(client)
</span><span class="cx"> , m_scriptExecutionContext(context)
</span><span class="cx"> , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx">
</span><span class="cx"> TextTrackLoader::~TextTrackLoader()
</span><span class="cx"> {
</span><del>- if (m_cachedCueData)
- m_cachedCueData->removeClient(this);
</del><ins>+ if (m_resource)
+ m_resource->removeClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackLoader::cueLoadTimerFired(Timer<TextTrackLoader>* timer)
</span><span class="lines">@@ -65,24 +65,24 @@
</span><span class="cx">
</span><span class="cx"> if (m_newCuesAvailable) {
</span><span class="cx"> m_newCuesAvailable = false;
</span><del>- m_client->newCuesAvailable(this);
</del><ins>+ m_client.newCuesAvailable(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_state >= Finished)
</span><del>- m_client->cueLoadingCompleted(this, m_state == Failed);
</del><ins>+ m_client.cueLoadingCompleted(this, m_state == Failed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackLoader::cancelLoad()
</span><span class="cx"> {
</span><del>- if (m_cachedCueData) {
- m_cachedCueData->removeClient(this);
- m_cachedCueData = 0;
</del><ins>+ if (m_resource) {
+ m_resource->removeClient(this);
+ m_resource = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackLoader::processNewCueData(CachedResource* resource)
</span><span class="cx"> {
</span><del>- ASSERT(m_cachedCueData == resource);
</del><ins>+ ASSERT(m_resource == resource);
</ins><span class="cx">
</span><span class="cx"> if (m_state == Failed || !resource->resourceBuffer())
</span><span class="cx"> return;
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> // FIXME: This is a very unusual pattern, no other CachedResourceClient does this. Refactor to use notifyFinished() instead.
</span><span class="cx"> void TextTrackLoader::deprecatedDidReceiveCachedResource(CachedResource* resource)
</span><span class="cx"> {
</span><del>- ASSERT(m_cachedCueData == resource);
</del><ins>+ ASSERT(m_resource == resource);
</ins><span class="cx">
</span><span class="cx"> if (!resource->resourceBuffer())
</span><span class="cx"> return;
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> void TextTrackLoader::notifyFinished(CachedResource* resource)
</span><span class="cx"> {
</span><del>- ASSERT(m_cachedCueData == resource);
</del><ins>+ ASSERT(m_resource == resource);
</ins><span class="cx">
</span><span class="cx"> Document* document = toDocument(m_scriptExecutionContext);
</span><span class="cx"> if (!m_crossOriginMode.isNull()
</span><span class="lines">@@ -152,9 +152,6 @@
</span><span class="cx"> {
</span><span class="cx"> cancelLoad();
</span><span class="cx">
</span><del>- if (!m_client->shouldLoadCues(this))
- return false;
-
</del><span class="cx"> ASSERT(m_scriptExecutionContext->isDocument());
</span><span class="cx"> Document* document = toDocument(m_scriptExecutionContext);
</span><span class="cx"> CachedResourceRequest cueRequest(ResourceRequest(document->completeURL(url)));
</span><span class="lines">@@ -172,12 +169,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
</span><del>- m_cachedCueData = cachedResourceLoader->requestTextTrack(cueRequest);
- if (m_cachedCueData)
- m_cachedCueData->addClient(this);
</del><ins>+ m_resource = cachedResourceLoader->requestTextTrack(cueRequest);
+ if (!m_resource)
+ return false;
+
+ m_resource->addClient(this);
</ins><span class="cx">
</span><del>- m_client->cueLoadingStarted(this);
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,7 +190,7 @@
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> void TextTrackLoader::newRegionsParsed()
</span><span class="cx"> {
</span><del>- m_client->newRegionsAvailable(this);
</del><ins>+ m_client.newRegionsAvailable(this);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.h (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.h 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/loader/TextTrackLoader.h 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -45,9 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~TextTrackLoaderClient() { }
</span><span class="cx">
</span><del>- virtual bool shouldLoadCues(TextTrackLoader*) = 0;
</del><span class="cx"> virtual void newCuesAvailable(TextTrackLoader*) = 0;
</span><del>- virtual void cueLoadingStarted(TextTrackLoader*) = 0;
</del><span class="cx"> virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) = 0;
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> virtual void newRegionsAvailable(TextTrackLoader*) = 0;
</span><span class="lines">@@ -58,7 +56,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(TextTrackLoader);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<TextTrackLoader> create(TextTrackLoaderClient* client, ScriptExecutionContext* context)
</del><ins>+ static PassOwnPtr<TextTrackLoader> create(TextTrackLoaderClient& client, ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> return adoptPtr(new TextTrackLoader(client, context));
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +81,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> virtual void fileFailedToParse();
</span><span class="cx">
</span><del>- TextTrackLoader(TextTrackLoaderClient*, ScriptExecutionContext*);
</del><ins>+ TextTrackLoader(TextTrackLoaderClient&, ScriptExecutionContext*);
</ins><span class="cx">
</span><span class="cx"> void processNewCueData(CachedResource*);
</span><span class="cx"> void cueLoadTimerFired(Timer<TextTrackLoader>*);
</span><span class="lines">@@ -91,9 +89,9 @@
</span><span class="cx">
</span><span class="cx"> enum State { Idle, Loading, Finished, Failed };
</span><span class="cx">
</span><del>- TextTrackLoaderClient* m_client;
</del><ins>+ TextTrackLoaderClient& m_client;
</ins><span class="cx"> OwnPtr<WebVTTParser> m_cueParser;
</span><del>- CachedResourceHandle<CachedTextTrack> m_cachedCueData;
</del><ins>+ CachedResourceHandle<CachedTextTrack> m_resource;
</ins><span class="cx"> ScriptExecutionContext* m_scriptExecutionContext;
</span><span class="cx"> Timer<TextTrackLoader> m_cueLoadTimer;
</span><span class="cx"> String m_crossOriginMode;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (162835 => 162836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-01-27 13:14:49 UTC (rev 162835)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-01-27 15:05:44 UTC (rev 162836)
</span><span class="lines">@@ -374,8 +374,6 @@
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> case CachedResource::TextTrackResource:
</span><del>- // Cues aren't called out in the CPS spec yet, but they only work with a media element
- // so use the media policy.
</del><span class="cx"> if (!shouldBypassMainWorldContentSecurityPolicy && !m_document->contentSecurityPolicy()->allowMediaFromSource(url))
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>