Diff
Modified: trunk/Source/WebCore/ChangeLog (98910 => 98911)
--- trunk/Source/WebCore/ChangeLog 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/ChangeLog 2011-10-31 23:49:47 UTC (rev 98911)
@@ -1,3 +1,22 @@
+2011-10-31 Nate Chapin <[email protected]>
+
+ Rename the remaining uses of Cue in WebCore/loader/
+ to TextTrack.
+ https://bugs.webkit.org/show_bug.cgi?id=71231
+
+ Reviewed by Eric Carlson.
+
+ No new tests, strictly a renaming.
+
+ * loader/TextTrackLoader.cpp:
+ * loader/cache/CachedResource.cpp:
+ * loader/cache/CachedResource.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ * loader/cache/CachedResourceLoader.h:
+ * loader/cache/CachedResourceRequest.cpp:
+ * loader/cache/CachedTextTrack.cpp:
+ * platform/network/chromium/ResourceRequest.h:
+
2011-10-27 Adam Klein <[email protected]>
[MutationObservers] Support characterDataOldValue for characterData mutations
Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (98910 => 98911)
--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2011-10-31 23:49:47 UTC (rev 98911)
@@ -161,7 +161,7 @@
ResourceRequest cueRequest(document->completeURL(url));
CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
- m_cachedCueData = static_cast<CachedTextTrack*>(cachedResourceLoader->requestCues(cueRequest));
+ m_cachedCueData = static_cast<CachedTextTrack*>(cachedResourceLoader->requestTextTrack(cueRequest));
if (m_cachedCueData)
m_cachedCueData->addClient(this);
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (98910 => 98911)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2011-10-31 23:49:47 UTC (rev 98911)
@@ -72,7 +72,7 @@
return ResourceLoadPriorityVeryLow;
#endif
#if ENABLE(VIDEO_TRACK)
- case CachedResource::CueResource:
+ case CachedResource::TextTrackResource:
return ResourceLoadPriorityLow;
#endif
}
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (98910 => 98911)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2011-10-31 23:49:47 UTC (rev 98911)
@@ -74,7 +74,7 @@
, LinkSubresource
#endif
#if ENABLE(VIDEO_TRACK)
- , CueResource
+ , TextTrackResource
#endif
};
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (98910 => 98911)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2011-10-31 23:49:47 UTC (rev 98911)
@@ -86,7 +86,7 @@
return new CachedResource(request, CachedResource::LinkSubresource);
#endif
#if ENABLE(VIDEO_TRACK)
- case CachedResource::CueResource:
+ case CachedResource::TextTrackResource:
return new CachedTextTrack(request);
#endif
}
@@ -162,9 +162,9 @@
}
#if ENABLE(VIDEO_TRACK)
-CachedTextTrack* CachedResourceLoader::requestCues(ResourceRequest& request)
+CachedTextTrack* CachedResourceLoader::requestTextTrack(ResourceRequest& request)
{
- return static_cast<CachedTextTrack*>(requestResource(CachedResource::CueResource, request, String(), defaultCachedResourceOptions()));
+ return static_cast<CachedTextTrack*>(requestResource(CachedResource::TextTrackResource, request, String(), defaultCachedResourceOptions()));
}
#endif
@@ -240,7 +240,7 @@
return false;
break;
#if ENABLE(VIDEO_TRACK)
- case CachedResource::CueResource:
+ case CachedResource::TextTrackResource:
#endif
case CachedResource::ImageResource:
case CachedResource::FontResource: {
@@ -288,7 +288,7 @@
case CachedResource::LinkSubresource:
#endif
#if ENABLE(VIDEO_TRACK)
- case CachedResource::CueResource:
+ case CachedResource::TextTrackResource:
#endif
// These types of resources can be loaded from any origin.
// FIXME: Are we sure about CachedResource::FontResource?
@@ -353,7 +353,7 @@
#endif
break;
#if ENABLE(VIDEO_TRACK)
- case CachedResource::CueResource:
+ case CachedResource::TextTrackResource:
// Cues aren't called out in the CPS spec yet, but they only work with a media element
// so use the media policy.
if (!m_document->contentSecurityPolicy()->allowMediaFromSource(url))
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (98910 => 98911)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2011-10-31 23:49:47 UTC (rev 98911)
@@ -75,7 +75,7 @@
CachedResource* requestLinkResource(CachedResource::Type, ResourceRequest&, ResourceLoadPriority = ResourceLoadPriorityUnresolved);
#endif
#if ENABLE(VIDEO_TRACK)
- CachedTextTrack* requestCues(ResourceRequest&);
+ CachedTextTrack* requestTextTrack(ResourceRequest&);
#endif
// Logs an access denied message to the console for the specified URL.
Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (98910 => 98911)
--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2011-10-31 23:49:47 UTC (rev 98911)
@@ -71,8 +71,8 @@
return ResourceRequest::TargetIsSubresource;
#endif
#if ENABLE(VIDEO_TRACK)
- case CachedResource::CueResource:
- return ResourceRequest::TargetIsCue;
+ case CachedResource::TextTrackResource:
+ return ResourceRequest::TargetIsTextTrack;
#endif
}
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp (98910 => 98911)
--- trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2011-10-31 23:49:47 UTC (rev 98911)
@@ -39,7 +39,7 @@
namespace WebCore {
CachedTextTrack::CachedTextTrack(const ResourceRequest& resourceRequest)
- : CachedResource(resourceRequest, CueResource)
+ : CachedResource(resourceRequest, TextTrackResource)
{
}
Modified: trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h (98910 => 98911)
--- trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h 2011-10-31 23:46:50 UTC (rev 98910)
+++ trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h 2011-10-31 23:49:47 UTC (rev 98911)
@@ -56,7 +56,7 @@
TargetIsPrerender,
TargetIsFavicon,
TargetIsXHR,
- TargetIsCue,
+ TargetIsTextTrack,
};
class ExtraData : public RefCounted<ExtraData> {
