2011-10-20 Eric Carlson <eric.carlson@apple.com>
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Oct 2011 18:05:14 +0000 (18:05 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Oct 2011 18:05:14 +0000 (18:05 +0000)
        Rename some Cue classes to TextTrack
        https://bugs.webkit.org/show_bug.cgi?id=70346

        Rename CueLoader -> TextTrackLoader, CachedCues -> CachedTextTrack, and CueIndex -> TextTrackIndex.

        Reviewed by Darin Adler.

        No new tests, renames only.

        * CMakeLists.txt:
        * GNUmakefile.list.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.xcodeproj/project.pbxproj:
        * html/CueIndex.cpp: Removed.
        * html/CueIndex.h: Removed.
        * html/LoadableTextTrack.cpp:
        (WebCore::LoadableTextTrack::load):
        (WebCore::LoadableTextTrack::newCuesAvailable):
        (WebCore::LoadableTextTrack::cueLoadingStarted):
        (WebCore::LoadableTextTrack::cueLoadingCompleted):
        * html/LoadableTextTrack.h:
        (WebCore::LoadableTextTrack::shouldLoadCues):
        * html/MutableTextTrack.h:
        * html/TextTrackIndex.cpp: Copied from Source/WebCore/html/CueIndex.cpp.
        (WebCore::TextTrackCueSet::difference):
        (WebCore::TextTrackCueSet::unionSet):
        (WebCore::TextTrackCueSet::add):
        (WebCore::TextTrackCueSet::contains):
        (WebCore::TextTrackCueSet::remove):
        (WebCore::TextTrackCueSet::isEmpty):
        (WebCore::TextTrackCueSet::size):
        (WebCore::TextTrackIndex::fetchNewCuesFromLoader):
        (WebCore::TextTrackIndex::removeCuesFromIndex):
        (WebCore::TextTrackIndex::visibleCuesAtTime):
        (WebCore::TextTrackIndex::add):
        (WebCore::TextTrackIndex::remove):
        * html/TextTrackIndex.h: Copied from Source/WebCore/html/CueIndex.h.
        (WebCore::TextTrackCueSet::TextTrackCueSet):
        (WebCore::TextTrackCueSet::~TextTrackCueSet):
        * loader/CueLoader.cpp: Removed.
        * loader/CueLoader.h: Removed.
        * loader/TextTrackLoader.cpp: Copied from Source/WebCore/loader/CueLoader.cpp.
        (WebCore::TextTrackLoader::TextTrackLoader):
        (WebCore::TextTrackLoader::~TextTrackLoader):
        (WebCore::TextTrackLoader::cueLoadTimerFired):
        (WebCore::TextTrackLoader::processNewCueData):
        (WebCore::TextTrackLoader::didReceiveData):
        (WebCore::TextTrackLoader::notifyFinished):
        (WebCore::TextTrackLoader::load):
        (WebCore::TextTrackLoader::newCuesParsed):
        (WebCore::TextTrackLoader::getNewCues):
        * loader/TextTrackLoader.h: Copied from Source/WebCore/loader/CueLoader.h.
        (WebCore::TextTrackLoaderClient::~TextTrackLoaderClient):
        (WebCore::TextTrackLoader::create):
        * loader/cache/CachedCues.cpp: Removed.
        * loader/cache/CachedCues.h: Removed.
        * loader/cache/CachedResourceLoader.cpp:
        (WebCore::createResource):
        (WebCore::CachedResourceLoader::requestCues):
        * loader/cache/CachedResourceLoader.h:
        * loader/cache/CachedTextTrack.cpp: Copied from Source/WebCore/loader/cache/CachedCues.cpp.
        (WebCore::CachedTextTrack::CachedTextTrack):
        (WebCore::CachedTextTrack::~CachedTextTrack):
        (WebCore::CachedTextTrack::data):
        * loader/cache/CachedTextTrack.h: Copied from Source/WebCore/loader/cache/CachedCues.h.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98000 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/LoadableTextTrack.cpp
Source/WebCore/html/LoadableTextTrack.h
Source/WebCore/html/MutableTextTrack.h
Source/WebCore/html/TextTrackCueIndex.cpp [moved from Source/WebCore/html/CueIndex.cpp with 71% similarity]
Source/WebCore/html/TextTrackCueIndex.h [moved from Source/WebCore/html/CueIndex.h with 79% similarity]
Source/WebCore/html/TextTrackCueList.cpp
Source/WebCore/loader/TextTrackLoader.cpp [moved from Source/WebCore/loader/CueLoader.cpp with 84% similarity]
Source/WebCore/loader/TextTrackLoader.h [moved from Source/WebCore/loader/CueLoader.h with 69% similarity]
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.h
Source/WebCore/loader/cache/CachedTextTrack.cpp [moved from Source/WebCore/loader/cache/CachedCues.cpp with 90% similarity]
Source/WebCore/loader/cache/CachedTextTrack.h [moved from Source/WebCore/loader/cache/CachedCues.h with 89% similarity]

index d4a91c2..a2fc5bb 100644 (file)
@@ -2055,11 +2055,12 @@ IF (ENABLE_VIDEO_TRACK)
         html/MutableTextTrack.cpp
         html/TextTrack.cpp
         html/TextTrackCue.cpp
+        html/TextTrackCueIndex.cpp
         html/TextTrackCueList.cpp
         html/track/WebVTTParser.cpp
         html/track/WebVTTTokenizer.cpp
-        loader/CueLoader.cpp
-        loader/cache/CachedCues.cpp
+        loader/TextTrackLoader.cpp
+        loader/cache/CachedTextTrack.cpp
     )
 ENDIF()
 
index 9b47da3..887ec02 100644 (file)
@@ -1,3 +1,72 @@
+2011-10-20  Eric Carlson  <eric.carlson@apple.com>
+
+        Rename some Cue classes to TextTrack
+        https://bugs.webkit.org/show_bug.cgi?id=70346
+
+        Rename CueLoader -> TextTrackLoader, CachedCues -> CachedTextTrack, and CueIndex -> TextTrackIndex.
+
+        Reviewed by Darin Adler.
+
+        No new tests, renames only.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/CueIndex.cpp: Removed.
+        * html/CueIndex.h: Removed.
+        * html/LoadableTextTrack.cpp:
+        (WebCore::LoadableTextTrack::load):
+        (WebCore::LoadableTextTrack::newCuesAvailable):
+        (WebCore::LoadableTextTrack::cueLoadingStarted):
+        (WebCore::LoadableTextTrack::cueLoadingCompleted):
+        * html/LoadableTextTrack.h:
+        (WebCore::LoadableTextTrack::shouldLoadCues):
+        * html/MutableTextTrack.h:
+        * html/TextTrackIndex.cpp: Copied from Source/WebCore/html/CueIndex.cpp.
+        (WebCore::TextTrackCueSet::difference):
+        (WebCore::TextTrackCueSet::unionSet):
+        (WebCore::TextTrackCueSet::add):
+        (WebCore::TextTrackCueSet::contains):
+        (WebCore::TextTrackCueSet::remove):
+        (WebCore::TextTrackCueSet::isEmpty):
+        (WebCore::TextTrackCueSet::size):
+        (WebCore::TextTrackIndex::fetchNewCuesFromLoader):
+        (WebCore::TextTrackIndex::removeCuesFromIndex):
+        (WebCore::TextTrackIndex::visibleCuesAtTime):
+        (WebCore::TextTrackIndex::add):
+        (WebCore::TextTrackIndex::remove):
+        * html/TextTrackIndex.h: Copied from Source/WebCore/html/CueIndex.h.
+        (WebCore::TextTrackCueSet::TextTrackCueSet):
+        (WebCore::TextTrackCueSet::~TextTrackCueSet):
+        * loader/CueLoader.cpp: Removed.
+        * loader/CueLoader.h: Removed.
+        * loader/TextTrackLoader.cpp: Copied from Source/WebCore/loader/CueLoader.cpp.
+        (WebCore::TextTrackLoader::TextTrackLoader):
+        (WebCore::TextTrackLoader::~TextTrackLoader):
+        (WebCore::TextTrackLoader::cueLoadTimerFired):
+        (WebCore::TextTrackLoader::processNewCueData):
+        (WebCore::TextTrackLoader::didReceiveData):
+        (WebCore::TextTrackLoader::notifyFinished):
+        (WebCore::TextTrackLoader::load):
+        (WebCore::TextTrackLoader::newCuesParsed):
+        (WebCore::TextTrackLoader::getNewCues):
+        * loader/TextTrackLoader.h: Copied from Source/WebCore/loader/CueLoader.h.
+        (WebCore::TextTrackLoaderClient::~TextTrackLoaderClient):
+        (WebCore::TextTrackLoader::create):
+        * loader/cache/CachedCues.cpp: Removed.
+        * loader/cache/CachedCues.h: Removed.
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::createResource):
+        (WebCore::CachedResourceLoader::requestCues):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/CachedTextTrack.cpp: Copied from Source/WebCore/loader/cache/CachedCues.cpp.
+        (WebCore::CachedTextTrack::CachedTextTrack):
+        (WebCore::CachedTextTrack::~CachedTextTrack):
+        (WebCore::CachedTextTrack::data):
+        * loader/cache/CachedTextTrack.h: Copied from Source/WebCore/loader/cache/CachedCues.h.
+
 2011-10-20  Joseph Pecoraro  <joepeck@webkit.org>
 
         Remove Now Unused FileChooserSettings.deprecatedAcceptTypes
index d958f5a..0988329 100644 (file)
@@ -1648,8 +1648,6 @@ webcore_sources += \
        Source/WebCore/html/CollectionType.h \
        Source/WebCore/html/ColorInputType.cpp \
        Source/WebCore/html/ColorInputType.h \
-       Source/WebCore/html/CueIndex.cpp \
-       Source/WebCore/html/CueIndex.h \
        Source/WebCore/html/DateInputType.cpp \
        Source/WebCore/html/DateInputType.h \
        Source/WebCore/html/DateTimeInputType.cpp \
@@ -1959,6 +1957,8 @@ webcore_sources += \
        Source/WebCore/html/TextTrack.h \
        Source/WebCore/html/TextTrackCue.cpp \
        Source/WebCore/html/TextTrackCue.h \
+       Source/WebCore/html/TextTrackCueIndex.cpp \
+       Source/WebCore/html/TextTrackCueIndex.h \
        Source/WebCore/html/TextTrackCueList.cpp \
        Source/WebCore/html/TextTrackCueList.h \
        Source/WebCore/html/TimeInputType.cpp \
@@ -2124,8 +2124,6 @@ webcore_sources += \
        Source/WebCore/loader/cache/MemoryCache.cpp \
        Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp \
        Source/WebCore/loader/cache/CachedCSSStyleSheet.h \
-       Source/WebCore/loader/cache/CachedCues.cpp \
-       Source/WebCore/loader/cache/CachedCues.h \
        Source/WebCore/loader/cache/CachedFont.cpp \
        Source/WebCore/loader/cache/CachedFont.h \
        Source/WebCore/loader/cache/CachedImage.cpp \
@@ -2145,6 +2143,8 @@ webcore_sources += \
        Source/WebCore/loader/cache/CachedScript.cpp \
        Source/WebCore/loader/cache/CachedScript.h \
        Source/WebCore/loader/cache/CachedStyleSheetClient.h \
+       Source/WebCore/loader/cache/CachedTextTrack.cpp \
+       Source/WebCore/loader/cache/CachedTextTrack.h \
        Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp \
        Source/WebCore/loader/cache/CachedXSLStyleSheet.h \
        Source/WebCore/loader/cache/MemoryCache.h \
@@ -2156,6 +2156,8 @@ webcore_sources += \
        Source/WebCore/loader/CrossOriginPreflightResultCache.h \
        Source/WebCore/loader/CueLoader.cpp \
        Source/WebCore/loader/CueLoader.h \
+       Source/WebCore/loader/TextTrackLoader.cpp \
+       Source/WebCore/loader/TextTrackLoader.h \
        Source/WebCore/loader/DocumentLoader.cpp \
        Source/WebCore/loader/DocumentLoader.h \
        Source/WebCore/loader/DocumentLoadTiming.h \
index fb0fc59..77943d8 100644 (file)
             'loader/CrossOriginAccessControl.cpp',
             'loader/CrossOriginAccessControl.h',
             'loader/CrossOriginPreflightResultCache.cpp',
-            'loader/CueLoader.cpp',
-            'loader/CueLoader.h',
             'loader/DocumentLoader.cpp',
             'loader/DocumentThreadableLoader.cpp',
             'loader/DocumentThreadableLoader.h',
             'loader/SubframeLoader.cpp',
             'loader/SubresourceLoader.cpp',
             'loader/TextResourceDecoder.cpp',
+            'loader/TextTrackLoader.cpp',
+            'loader/TextTrackLoader.h',
             'loader/ThreadableLoader.cpp',
             'loader/ThreadableLoaderClient.h',
             'loader/ThreadableLoaderClientWrapper.h',
             'loader/archive/mhtml/MHTMLParser.cpp',
             'loader/cache/CachedCSSStyleSheet.cpp',
             'loader/cache/CachedCSSStyleSheet.h',
-            'loader/cache/CachedCues.cpp',
-            'loader/cache/CachedCues.h',
             'loader/cache/CachedFont.cpp',
             'loader/cache/CachedFont.h',
             'loader/cache/CachedImage.cpp',
             'loader/cache/CachedResourceRequest.cpp',
             'loader/cache/CachedScript.cpp',
             'loader/cache/CachedScript.h',
+            'loader/cache/CachedTextTrack.cpp',
+            'loader/cache/CachedTextTrack.h',
             'loader/cache/CachedXSLStyleSheet.cpp',
             'loader/cache/CachedXSLStyleSheet.h',
             'loader/cache/MemoryCache.cpp',
             'html/CollectionCache.cpp',
             'html/ColorInputType.cpp',
             'html/ColorInputType.h',
-            'html/CueIndex.cpp',
-            'html/CueIndex.h',
             'html/DOMFormData.cpp',
             'html/DOMFormData.h',
             'html/DOMSettableTokenList.cpp',
             'html/TextTrack.h',
             'html/TextTrackCue.cpp',
             'html/TextTrackCue.h',
+            'html/TextTrackCueIndex.cpp',
+            'html/TextTrackCueIndex.h',
             'html/TextTrackCueList.cpp',
             'html/TextTrackCueList.h',
             'html/TimeInputType.cpp',
index 6c9d49a..65c234c 100644 (file)
@@ -1714,7 +1714,6 @@ HEADERS += \
     html/canvas/Uint8Array.h \
     html/ClassList.h \
     html/CollectionCache.h \
-    html/CueIndex.h \
     html/DOMFormData.h \
     html/DOMSettableTokenList.h \
     html/DOMTokenList.h \
@@ -1819,6 +1818,7 @@ HEADERS += \
     html/TextDocument.h \
     html/TextTrack.h \
     html/TextTrackCue.h \
+    html/TextTrackCueIndex.h \
     html/TextTrackCueList.h \
     html/TimeRanges.h \
     html/ValidityState.h \
@@ -1905,7 +1905,6 @@ HEADERS += \
     loader/cache/MemoryCache.h \
     loader/CrossOriginAccessControl.h \
     loader/CrossOriginPreflightResultCache.h \
-    loader/CueLoader.h \
     loader/cache/CachedResourceLoader.h \
     loader/DocumentLoader.h \
     loader/DocumentThreadableLoader.h \
@@ -1930,6 +1929,7 @@ HEADERS += \
     loader/ResourceLoader.h \
     loader/SubresourceLoader.h \
     loader/TextResourceDecoder.h \
+    loader/TextTrackLoader.h \
     loader/ThreadableLoader.h \
     loader/WorkerThreadableLoader.h \
     mathml/MathMLElement.h \
index 0397571..f54bc0a 100644 (file)
                0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */; };
                072C8B11131C518600A4FCE9 /* MediaPlayerPrivateAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */; };
                0735EE6A0F40C5E4004A2604 /* MediaPlayerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               0753860214489E9800B78452 /* CachedCues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0753860014489E9800B78452 /* CachedCues.cpp */; };
-               0753860314489E9800B78452 /* CachedCues.h in Headers */ = {isa = PBXBuildFile; fileRef = 0753860114489E9800B78452 /* CachedCues.h */; };
-               076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */; };
                073A3AE3142BAFE100977A4C /* JSTextTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073A3AE2142BAFE100977A4C /* JSTextTrackCustom.cpp */; };
+               0753860214489E9800B78452 /* CachedTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0753860014489E9800B78452 /* CachedTextTrack.cpp */; };
+               0753860314489E9800B78452 /* CachedTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 0753860114489E9800B78452 /* CachedTextTrack.h */; };
+               076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */; };
                07B0113F1032242200FBDC33 /* AccessibilityMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */; };
                0806E57A12893045007CED32 /* SVGMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 0806E57912893045007CED32 /* SVGMatrix.h */; settings = {ATTRIBUTES = (Private, ); }; };
                080E49261255F3BD00EFCA27 /* SVGTextLayoutEngineBaseline.h in Headers */ = {isa = PBXBuildFile; fileRef = 080E49221255F3BD00EFCA27 /* SVGTextLayoutEngineBaseline.h */; };
                B14353F8138EA95B00D53276 /* JSMediaStreamList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B14353F6138EA95B00D53276 /* JSMediaStreamList.cpp */; };
                B14353F9138EA95B00D53276 /* JSMediaStreamList.h in Headers */ = {isa = PBXBuildFile; fileRef = B14353F7138EA95B00D53276 /* JSMediaStreamList.h */; };
                B1827493134CA4C100B98C2D /* CallbackFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1827492134CA4C100B98C2D /* CallbackFunction.cpp */; };
-               B1AD4E5C13A12A0B00846B27 /* CueIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E4B13A12A0B00846B27 /* CueIndex.cpp */; };
-               B1AD4E5D13A12A0B00846B27 /* CueIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E4C13A12A0B00846B27 /* CueIndex.h */; };
+               B1AD4E5C13A12A0B00846B27 /* TextTrackCueIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E4B13A12A0B00846B27 /* TextTrackCueIndex.cpp */; };
+               B1AD4E5D13A12A0B00846B27 /* TextTrackCueIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E4C13A12A0B00846B27 /* TextTrackCueIndex.h */; };
                B1AD4E5E13A12A0B00846B27 /* LoadableTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */; };
                B1AD4E5F13A12A0B00846B27 /* LoadableTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */; };
                B1AD4E6213A12A0B00846B27 /* MutableTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5113A12A0B00846B27 /* MutableTextTrack.cpp */; };
                B1AD4E6313A12A0B00846B27 /* MutableTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E5213A12A0B00846B27 /* MutableTextTrack.h */; };
                B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5513A12A0B00846B27 /* TextTrack.cpp */; };
-               B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E5613A12A0B00846B27 /* TextTrack.h */; };
+               B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E5613A12A0B00846B27 /* TextTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B1AD4E6813A12A0B00846B27 /* TextTrackCue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5713A12A0B00846B27 /* TextTrackCue.cpp */; };
                B1AD4E6913A12A0B00846B27 /* TextTrackCue.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E5813A12A0B00846B27 /* TextTrackCue.h */; };
                B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */; };
                B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.h */; };
-               B1AD4E7313A12A4600846B27 /* CueLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E7113A12A4600846B27 /* CueLoader.cpp */; };
-               B1AD4E7413A12A4600846B27 /* CueLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E7213A12A4600846B27 /* CueLoader.h */; };
+               B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E7113A12A4600846B27 /* TextTrackLoader.cpp */; };
+               B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E7213A12A4600846B27 /* TextTrackLoader.h */; };
                B1D5ECB5134B58DA0087C78F /* CallbackFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = B1D5ECB4134B58DA0087C78F /* CallbackFunction.h */; };
                B1E5457A1346291F0092A545 /* LocalMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1E545711346291F0092A545 /* LocalMediaStream.cpp */; };
                B1E5457B1346291F0092A545 /* LocalMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = B1E545721346291F0092A545 /* LocalMediaStream.h */; };
                0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySlider.h; sourceTree = "<group>"; };
                070DD8F50F01868000727DEB /* mediaControls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControls.css; sourceTree = "<group>"; };
                0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerProxy.h; sourceTree = "<group>"; };
-               0753860014489E9800B78452 /* CachedCues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedCues.cpp; sourceTree = "<group>"; };
-               0753860114489E9800B78452 /* CachedCues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedCues.h; sourceTree = "<group>"; };
+               073A3AE2142BAFE100977A4C /* JSTextTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCustom.cpp; sourceTree = "<group>"; };
+               0753860014489E9800B78452 /* CachedTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedTextTrack.cpp; sourceTree = "<group>"; };
+               0753860114489E9800B78452 /* CachedTextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedTextTrack.h; sourceTree = "<group>"; };
                076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateAVFoundation.cpp; sourceTree = "<group>"; };
                076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundation.h; sourceTree = "<group>"; };
                079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivate.h; sourceTree = "<group>"; };
-               073A3AE2142BAFE100977A4C /* JSTextTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCustom.cpp; sourceTree = "<group>"; };
                07AFE5900F1446BD00841617 /* mediaControlsQuickTime.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = mediaControlsQuickTime.css; sourceTree = "<group>"; };
                07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMediaControls.h; sourceTree = "<group>"; };
                0806E57912893045007CED32 /* SVGMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGMatrix.h; sourceTree = "<group>"; };
                B14353F6138EA95B00D53276 /* JSMediaStreamList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamList.cpp; sourceTree = "<group>"; };
                B14353F7138EA95B00D53276 /* JSMediaStreamList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamList.h; sourceTree = "<group>"; };
                B1827492134CA4C100B98C2D /* CallbackFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallbackFunction.cpp; sourceTree = "<group>"; };
-               B1AD4E4B13A12A0B00846B27 /* CueIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CueIndex.cpp; sourceTree = "<group>"; };
-               B1AD4E4C13A12A0B00846B27 /* CueIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueIndex.h; sourceTree = "<group>"; };
+               B1AD4E4B13A12A0B00846B27 /* TextTrackCueIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueIndex.cpp; sourceTree = "<group>"; };
+               B1AD4E4C13A12A0B00846B27 /* TextTrackCueIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueIndex.h; sourceTree = "<group>"; };
                B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableTextTrack.cpp; sourceTree = "<group>"; };
                B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadableTextTrack.h; sourceTree = "<group>"; };
                B1AD4E5113A12A0B00846B27 /* MutableTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutableTextTrack.cpp; sourceTree = "<group>"; };
                B1AD4E5813A12A0B00846B27 /* TextTrackCue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCue.h; sourceTree = "<group>"; };
                B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueList.cpp; sourceTree = "<group>"; };
                B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueList.h; sourceTree = "<group>"; };
-               B1AD4E7113A12A4600846B27 /* CueLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CueLoader.cpp; path = loader/CueLoader.cpp; sourceTree = SOURCE_ROOT; };
-               B1AD4E7213A12A4600846B27 /* CueLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CueLoader.h; path = loader/CueLoader.h; sourceTree = SOURCE_ROOT; };
+               B1AD4E7113A12A4600846B27 /* TextTrackLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextTrackLoader.cpp; path = loader/TextTrackLoader.cpp; sourceTree = SOURCE_ROOT; };
+               B1AD4E7213A12A4600846B27 /* TextTrackLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextTrackLoader.h; path = loader/TextTrackLoader.h; sourceTree = SOURCE_ROOT; };
                B1D5ECB4134B58DA0087C78F /* CallbackFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallbackFunction.h; sourceTree = "<group>"; };
                B1E545711346291F0092A545 /* LocalMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalMediaStream.cpp; sourceTree = "<group>"; };
                B1E545721346291F0092A545 /* LocalMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalMediaStream.h; sourceTree = "<group>"; };
                                93C441FF0F813AE100C1A634 /* CollectionType.h */,
                                F55B3D7F1251F12D003EF269 /* ColorInputType.cpp */,
                                F55B3D801251F12D003EF269 /* ColorInputType.h */,
-                               B1AD4E4B13A12A0B00846B27 /* CueIndex.cpp */,
-                               B1AD4E4C13A12A0B00846B27 /* CueIndex.h */,
                                F55B3D811251F12D003EF269 /* DateInputType.cpp */,
                                F55B3D821251F12D003EF269 /* DateInputType.h */,
                                F55B3D831251F12D003EF269 /* DateTimeInputType.cpp */,
                                B1AD4E5713A12A0B00846B27 /* TextTrackCue.cpp */,
                                B1AD4E5813A12A0B00846B27 /* TextTrackCue.h */,
                                0707569D1422979800414161 /* TextTrackCue.idl */,
+                               B1AD4E4B13A12A0B00846B27 /* TextTrackCueIndex.cpp */,
+                               B1AD4E4C13A12A0B00846B27 /* TextTrackCueIndex.h */,
                                B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */,
                                B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.h */,
                                0707569E1422979800414161 /* TextTrackCueList.idl */,
                A8D2B2521287A56000AF4DDA /* cache */ = {
                        isa = PBXGroup;
                        children = (
-                               0753860014489E9800B78452 /* CachedCues.cpp */,
-                               0753860114489E9800B78452 /* CachedCues.h */,
                                BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */,
                                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
                                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
                                BCB16C0A0979C3BD00467741 /* CachedScript.cpp */,
                                BCB16C0B0979C3BD00467741 /* CachedScript.h */,
                                D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */,
+                               0753860014489E9800B78452 /* CachedTextTrack.cpp */,
+                               0753860114489E9800B78452 /* CachedTextTrack.h */,
                                BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
                                BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
                                F587864902DE3A9A01EA4122 /* CachePolicy.h */,
                                E1C416110F6562FD0092D2FB /* CrossOriginAccessControl.h */,
                                E1C415DD0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp */,
                                E1C415D90F655D6F0092D2FB /* CrossOriginPreflightResultCache.h */,
-                               B1AD4E7113A12A4600846B27 /* CueLoader.cpp */,
-                               B1AD4E7213A12A4600846B27 /* CueLoader.h */,
                                93E227DB0AF589AD00D48324 /* DocumentLoader.cpp */,
                                656D371E0ADBA5DE00A4554D /* DocumentLoader.h */,
                                8A12E35C11FA33280025836A /* DocumentLoadTiming.h */,
                                1A8F6B010DB53006001DB794 /* SubstituteResource.h */,
                                F523D27802DE43D7018635CA /* TextResourceDecoder.cpp */,
                                F523D27902DE43D7018635CA /* TextResourceDecoder.h */,
+                               B1AD4E7113A12A4600846B27 /* TextTrackLoader.cpp */,
+                               B1AD4E7213A12A4600846B27 /* TextTrackLoader.h */,
                                0B90561D0F257E930095FF6A /* ThreadableLoader.cpp */,
                                0B9056170F2578BE0095FF6A /* ThreadableLoader.h */,
                                0B9056180F2578BE0095FF6A /* ThreadableLoaderClient.h */,
                                6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
                                A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
                                501BA9E21393CEA000F7ACEB /* CSSWrapShapes.h in Headers */,
-                               B1AD4E5D13A12A0B00846B27 /* CueIndex.h in Headers */,
-                               B1AD4E7413A12A4600846B27 /* CueLoader.h in Headers */,
                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
                                BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */,
                                B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
                                B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */,
                                B1AD4E6913A12A0B00846B27 /* TextTrackCue.h in Headers */,
+                               B1AD4E5D13A12A0B00846B27 /* TextTrackCueIndex.h in Headers */,
                                B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */,
+                               B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */,
                                498770F11242C535002226BA /* Texture.h in Headers */,
                                97BC84A512370DC8000C6161 /* TextViewSourceParser.h in Headers */,
                                BCE658FF0EA9248A007E4533 /* Theme.h in Headers */,
                                9B375EDB14478A0100F3CAE5 /* MicroDataItemList.h in Headers */,
                                49AF2D6914435D050016A784 /* DisplayRefreshMonitor.h in Headers */,
                                71CCB49D144824AC00C676D6 /* ImageBySizeCache.h in Headers */,
-                               0753860314489E9800B78452 /* CachedCues.h in Headers */,
+                               0753860314489E9800B78452 /* CachedTextTrack.h in Headers */,
                                8AA61D00144D595B00F37350 /* CSSRegionStyleRule.h in Headers */,
                                97665013144FAA4200F6BB51 /* EventFactory.h in Headers */,
                                A0EE0DF6144F825500F80B0D /* WebGLDebugRendererInfo.h in Headers */,
                                1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */,
                                A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
                                50E566D6139E38C500214433 /* CSSWrapShapes.cpp in Sources */,
-                               B1AD4E5C13A12A0B00846B27 /* CueIndex.cpp in Sources */,
-                               B1AD4E7313A12A4600846B27 /* CueLoader.cpp in Sources */,
                                E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
                                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
                                62CD32591157E57C0063B0A7 /* CustomEvent.cpp in Sources */,
                                B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
                                B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */,
                                B1AD4E6813A12A0B00846B27 /* TextTrackCue.cpp in Sources */,
+                               B1AD4E5C13A12A0B00846B27 /* TextTrackCueIndex.cpp in Sources */,
                                B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */,
+                               B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */,
                                498770F01242C535002226BA /* Texture.cpp in Sources */,
                                97BC84A412370DC8000C6161 /* TextViewSourceParser.cpp in Sources */,
                                BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */,
                                49AF2D6C14435D210016A784 /* DisplayRefreshMonitorMac.cpp in Sources */,
                                49FC7A501444AF5F00A5D864 /* DisplayRefreshMonitor.cpp in Sources */,
                                71CCB49C144824AC00C676D6 /* ImageBySizeCache.cpp in Sources */,
-                               0753860214489E9800B78452 /* CachedCues.cpp in Sources */,
+                               0753860214489E9800B78452 /* CachedTextTrack.cpp in Sources */,
                                8AA61CFF144D595B00F37350 /* CSSRegionStyleRule.cpp in Sources */,
                                9766504F144FBFFE00F6BB51 /* EventFactory.cpp in Sources */,
                                A0EE0DF5144F825500F80B0D /* WebGLDebugRendererInfo.cpp in Sources */,
index c415c01..69b2ac6 100644 (file)
@@ -44,28 +44,28 @@ LoadableTextTrack::~LoadableTextTrack()
 
 void LoadableTextTrack::load(const KURL& url, ScriptExecutionContext* context)
 {
-    if (!m_cueLoader)
-        m_cueLoader = CueLoader::create(this, context);
-    m_cueLoader->load(url);
+    if (!m_loader)
+        m_loader = TextTrackLoader::create(this, context);
+    m_loader->load(url);
 }
 
-void LoadableTextTrack::newCuesAvailable(CueLoader* loader)
+void LoadableTextTrack::newCuesAvailable(TextTrackLoader* loader)
 {
-    ASSERT_UNUSED(loader, m_cueLoader == loader);
+    ASSERT_UNUSED(loader, m_loader == loader);
 
     // FIXME(62885): Implement.
 }
 
-void LoadableTextTrack::cueLoadingStarted(CueLoader* loader)
+void LoadableTextTrack::cueLoadingStarted(TextTrackLoader* loader)
 {
-    ASSERT_UNUSED(loader, m_cueLoader == loader);
+    ASSERT_UNUSED(loader, m_loader == loader);
     
     setReadyState(TextTrack::Loading);
 }
 
-void LoadableTextTrack::cueLoadingCompleted(CueLoader* loader, bool)
+void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool)
 {
-    ASSERT_UNUSED(loader, m_cueLoader == loader);
+    ASSERT_UNUSED(loader, m_loader == loader);
 
     // FIXME(62885): Implement.
 }
index 3ce79b0..df52190 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CueLoader.h"
 #include "TextTrack.h"
+#include "TextTrackLoader.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
@@ -46,7 +46,7 @@ public:
     virtual void textTrackLoadingCompleted(LoadableTextTrack*, bool /* loadingFailed */) = 0;
 };
 
-class LoadableTextTrack : public TextTrack, private CueLoaderClient {
+class LoadableTextTrack : public TextTrack, private TextTrackLoaderClient {
 public:
     static PassRefPtr<LoadableTextTrack> create(TextTrackClient* trackClient, TextTrackLoadingClient* loadingClient, const String& kind, const String& label, const String& language, bool isDefault)
     {
@@ -58,15 +58,15 @@ public:
     bool supportsType(const String&);
 
 private:
-    // CueLoaderClient
-    virtual bool shouldLoadCues(CueLoader*) { return true; }
-    virtual void newCuesAvailable(CueLoader*);
-    virtual void cueLoadingStarted(CueLoader*);
-    virtual void cueLoadingCompleted(CueLoader*, bool loadingFailed);
+    // TextTrackLoaderClient
+    virtual bool shouldLoadCues(TextTrackLoader*) { return true; }
+    virtual void newCuesAvailable(TextTrackLoader*);
+    virtual void cueLoadingStarted(TextTrackLoader*);
+    virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed);
 
     LoadableTextTrack(TextTrackClient*, TextTrackLoadingClient*, const String& kind, const String& label, const String& language, bool isDefault);
 
-    OwnPtr<CueLoader> m_cueLoader;
+    OwnPtr<TextTrackLoader> m_loader;
     TextTrackLoadingClient* m_loadingClient;
     bool m_isDefault;
 };
index e0f4765..5906ea6 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CueLoader.h"
 #include "TextTrack.h"
+#include "TextTrackLoader.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
similarity index 71%
rename from Source/WebCore/html/CueIndex.cpp
rename to Source/WebCore/html/TextTrackCueIndex.cpp
index 33cf92e..26cc505 100644 (file)
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CueIndex.h"
+#include "TextTrackCueIndex.h"
 
 #include "TextTrackCue.h"
 #include "TextTrackCueList.h"
 
 namespace WebCore {
 
-CueSet CueSet::difference(const CueSet&) const
+TextTrackCueSet TextTrackCueSet::difference(const TextTrackCueSet&) const
 {
     // FIXME(62883): Implement.
-    return CueSet();
+    return TextTrackCueSet();
 }
 
-CueSet CueSet::unionSet(const CueSet&) const
+TextTrackCueSet TextTrackCueSet::unionSet(const TextTrackCueSet&) const
 {
     // FIXME(62883): Implement.
-    return CueSet();
+    return TextTrackCueSet();
 }
 
-void CueSet::add(const TextTrackCue&)
+void TextTrackCueSet::add(const TextTrackCue&)
 {
     // FIXME(62883): Implement.
 }
 
-bool CueSet::contains(const TextTrackCue&) const
+bool TextTrackCueSet::contains(const TextTrackCue&) const
 {
     // FIXME(62883): Implement.
     return false;
 }
 
-void CueSet::remove(const TextTrackCue&)
+void TextTrackCueSet::remove(const TextTrackCue&)
 {
     // FIXME(62883): Implement.
 }
 
-bool CueSet::isEmpty() const
+bool TextTrackCueSet::isEmpty() const
 {
     // FIXME(62883): Implement.
     return false;
 }
 
-int CueSet::size() const
+int TextTrackCueSet::size() const
 {
     // FIXME(62883): Implement.
     return 0;
 }
 
-void CueIndex::fetchNewCuesFromLoader(CueLoader*)
+void TextTrackCueIndex::fetchNewCuesFromLoader(TextTrackLoader*)
 {
     // FIXME(62883): Implement.
 }
 
-void CueIndex::removeCuesFromIndex(const TextTrackCueList*)
+void TextTrackCueIndex::removeCuesFromIndex(const TextTrackCueList*)
 {
     // FIXME(62883): Implement.
 }
 
-CueSet CueIndex::visibleCuesAtTime(double) const
+TextTrackCueSet TextTrackCueIndex::visibleCuesAtTime(double) const
 {
     // FIXME(62855): Implement.
-    return CueSet();
+    return TextTrackCueSet();
 }
 
-void CueIndex::add(TextTrackCue*)
+void TextTrackCueIndex::add(TextTrackCue*)
 {
     // FIXME(62890): Implement.
 }
 
-void CueIndex::remove(TextTrackCue*)
+void TextTrackCueIndex::remove(TextTrackCue*)
 {
     // FIXME(62890): Implement.
 }
similarity index 79%
rename from Source/WebCore/html/CueIndex.h
rename to Source/WebCore/html/TextTrackCueIndex.h
index 862e2da..9ed0b22 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CueIndex_h
-#define CueIndex_h
+#ifndef TextTrackCueIndex_h
+#define TextTrackCueIndex_h
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CueLoader.h"
+#include "TextTrackLoader.h"
 #include <wtf/HashSet.h>
 
 namespace WebCore {
@@ -36,12 +36,12 @@ namespace WebCore {
 class TextTrackCue;
 class TextTrackCueList;
 
-class CueSet {
+class TextTrackCueSet {
 public:
-    CueSet() { }
-    ~CueSet() { }
-    CueSet difference(const CueSet&) const;
-    CueSet unionSet(const CueSet&) const;
+    TextTrackCueSet() { }
+    ~TextTrackCueSet() { }
+    TextTrackCueSet difference(const TextTrackCueSet&) const;
+    TextTrackCueSet unionSet(const TextTrackCueSet&) const;
     void add(const TextTrackCue&);
     bool contains(const TextTrackCue&) const;
     void remove(const TextTrackCue&);
@@ -51,14 +51,14 @@ private:
     HashSet<TextTrackCue*> m_set;
 };
 
-class CueIndex : public CueLoaderClient {
+class TextTrackCueIndex : public TextTrackLoaderClient {
 public:
-    // CueLoaderClient methods.
-    void fetchNewCuesFromLoader(CueLoader*);
+    // TextTrackLoaderClient methods.
+    void fetchNewCuesFromLoader(TextTrackLoader*);
     void removeCuesFromIndex(const TextTrackCueList*);
 
     // Returns set of cues visible at a time in seconds.
-    CueSet visibleCuesAtTime(double) const;
+    TextTrackCueSet visibleCuesAtTime(double) const;
     void add(TextTrackCue*);
     void remove(TextTrackCue*);
 };
index 07740f8..f802972 100644 (file)
@@ -42,7 +42,7 @@ unsigned long TextTrackCueList::length() const
     return 0;
 }
 
-TextTrackCue* TextTrackCueList::item(unsigned index) const
+TextTrackCue* TextTrackCueList::item(unsigned) const
 {
     // FIXME(62883): Implement.
     return 0;
similarity index 84%
rename from Source/WebCore/loader/CueLoader.cpp
rename to Source/WebCore/loader/TextTrackLoader.cpp
index 5ac60de..f0f063e 100644 (file)
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CueLoader.h"
+#include "TextTrackLoader.h"
 
-#include "CachedCues.h"
 #include "CachedResourceLoader.h"
+#include "CachedTextTrack.h"
 #include "Document.h"
 #include "Logging.h"
 #include "ResourceHandle.h"
 
 namespace WebCore {
     
-CueLoader::CueLoader(CueLoaderClient* client, ScriptExecutionContext* context)
+TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, ScriptExecutionContext* context)
     : m_client(client)
     , m_scriptExecutionContext(context)
-    , m_cueLoadTimer(this, &CueLoader::cueLoadTimerFired)
+    , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired)
     , m_state(Idle)
     , m_parseOffset(0)
     , m_newCuesAvailable(false)
 {
 }
 
-CueLoader::~CueLoader()
+TextTrackLoader::~TextTrackLoader()
 {
     if (m_cachedCueData)
         m_cachedCueData->removeClient(this);
 }
 
-void CueLoader::cueLoadTimerFired(Timer<CueLoader>* timer)
+void TextTrackLoader::cueLoadTimerFired(Timer<TextTrackLoader>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_cueLoadTimer);
     
@@ -68,7 +68,7 @@ void CueLoader::cueLoadTimerFired(Timer<CueLoader>* timer)
         m_client->cueLoadingCompleted(this, m_state == Failed);
 }
 
-void CueLoader::processNewCueData(CachedResource* resource)
+void TextTrackLoader::processNewCueData(CachedResource* resource)
 {
     ASSERT(m_cachedCueData == resource);
     
@@ -101,7 +101,7 @@ void CueLoader::processNewCueData(CachedResource* resource)
             }
             
             if (!WebVTTParser::hasRequiredFileIdentifier(identifier.data(), identifier.size())) {
-                LOG(Media, "CueLoader::didReceiveData - file \"%s\" does not have WebVTT magic header", 
+                LOG(Media, "TextTrackLoader::didReceiveData - file \"%s\" does not have WebVTT magic header", 
                     resource->response().url().string().utf8().data());
                 m_state = Failed;
                 m_cueLoadTimer.startOneShot(0);
@@ -121,7 +121,7 @@ void CueLoader::processNewCueData(CachedResource* resource)
     
 }
 
-void CueLoader::didReceiveData(CachedResource* resource)
+void TextTrackLoader::didReceiveData(CachedResource* resource)
 {
     ASSERT(m_cachedCueData == resource);
     
@@ -131,7 +131,7 @@ void CueLoader::didReceiveData(CachedResource* resource)
     processNewCueData(resource);
 }
 
-void CueLoader::notifyFinished(CachedResource* resource)
+void TextTrackLoader::notifyFinished(CachedResource* resource)
 {
     ASSERT(m_cachedCueData == resource);
 
@@ -146,7 +146,7 @@ void CueLoader::notifyFinished(CachedResource* resource)
     m_cachedCueData = 0;
 }
 
-bool CueLoader::load(const KURL& url)
+bool TextTrackLoader::load(const KURL& url)
 {
     if (!m_client->shouldLoadCues(this))
         return false;
@@ -161,7 +161,7 @@ bool CueLoader::load(const KURL& url)
     
     ResourceRequest cueRequest(document->completeURL(url));
     CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
-    m_cachedCueData = static_cast<CachedCues*>(cachedResourceLoader->requestCues(cueRequest));
+    m_cachedCueData = static_cast<CachedTextTrack*>(cachedResourceLoader->requestCues(cueRequest));
     if (m_cachedCueData)
         m_cachedCueData->addClient(this);
     
@@ -170,7 +170,7 @@ bool CueLoader::load(const KURL& url)
     return true;
 }
 
-void CueLoader::newCuesParsed()
+void TextTrackLoader::newCuesParsed()
 {
     if (m_cueLoadTimer.isActive())
         return;
@@ -179,7 +179,7 @@ void CueLoader::newCuesParsed()
     m_cueLoadTimer.startOneShot(0);
 }
 
-void CueLoader::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues)
+void TextTrackLoader::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
similarity index 69%
rename from Source/WebCore/loader/CueLoader.h
rename to Source/WebCore/loader/TextTrackLoader.h
index 8bf6a05..4bc7d65 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CueLoader_h
-#define CueLoader_h
+#ifndef TextTrackLoader_h
+#define TextTrackLoader_h
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CachedCues.h"
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
+#include "CachedTextTrack.h"
 #include "Document.h"
 #include "Timer.h"
 #include "WebVTTParser.h"
 
 namespace WebCore {
 
-class CueLoader;
+class TextTrackLoader;
 class ScriptExecutionContext;
 
-class CueLoaderClient {
+class TextTrackLoaderClient {
 public:
-    virtual ~CueLoaderClient() { }
+    virtual ~TextTrackLoaderClient() { }
     
-    virtual bool shouldLoadCues(CueLoader*) = 0;
-    virtual void newCuesAvailable(CueLoader*) = 0;
-    virtual void cueLoadingStarted(CueLoader*) = 0;
-    virtual void cueLoadingCompleted(CueLoader*, bool loadingFailed) = 0;
+    virtual bool shouldLoadCues(TextTrackLoader*) = 0;
+    virtual void newCuesAvailable(TextTrackLoader*) = 0;
+    virtual void cueLoadingStarted(TextTrackLoader*) = 0;
+    virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) = 0;
 };
 
-class CueLoader : public CachedResourceClient, private WebVTTParserClient {
-    WTF_MAKE_NONCOPYABLE(CueLoader); 
+class TextTrackLoader : public CachedResourceClient, private WebVTTParserClient {
+    WTF_MAKE_NONCOPYABLE(TextTrackLoader); 
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<CueLoader> create(CueLoaderClient* client, ScriptExecutionContext* context)
+    static PassOwnPtr<TextTrackLoader> create(TextTrackLoaderClient* client, ScriptExecutionContext* context)
     {
-        return adoptPtr(new CueLoader(client, context));
+        return adoptPtr(new TextTrackLoader(client, context));
     }
-    virtual ~CueLoader();
+    virtual ~TextTrackLoader();
     
     bool load(const KURL&);
     void getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues);
@@ -73,18 +73,18 @@ private:
     // WebVTTParserClient
     virtual void newCuesParsed();
     
-    CueLoader(CueLoaderClient*, ScriptExecutionContext*);
+    TextTrackLoader(TextTrackLoaderClient*, ScriptExecutionContext*);
     
     void processNewCueData(CachedResource*);
-    void cueLoadTimerFired(Timer<CueLoader>*);
+    void cueLoadTimerFired(Timer<TextTrackLoader>*);
 
     enum State { Idle, Loading, Finished, Failed };
     
-    CueLoaderClient* m_client;
+    TextTrackLoaderClient* m_client;
     OwnPtr<WebVTTParser> m_cueParser;
-    CachedResourceHandle<CachedCues> m_cachedCueData;
+    CachedResourceHandle<CachedTextTrack> m_cachedCueData;
     ScriptExecutionContext* m_scriptExecutionContext;
-    Timer<CueLoader> m_cueLoadTimer;
+    Timer<TextTrackLoader> m_cueLoadTimer;
     State m_state;
     unsigned m_parseOffset;
     bool m_newCuesAvailable;
index ca277a2..46ad494 100644 (file)
@@ -53,7 +53,7 @@
 #include <wtf/text/WTFString.h>
 
 #if ENABLE(VIDEO_TRACK)
-#include "CachedCues.h"
+#include "CachedTextTrack.h"
 #endif
 
 #define PRELOAD_DEBUG 0
@@ -87,7 +87,7 @@ static CachedResource* createResource(CachedResource::Type type, ResourceRequest
 #endif
 #if ENABLE(VIDEO_TRACK)
     case CachedResource::CueResource:
-        return new CachedCues(request);
+        return new CachedTextTrack(request);
 #endif
     }
     ASSERT_NOT_REACHED();
@@ -162,9 +162,9 @@ CachedFont* CachedResourceLoader::requestFont(ResourceRequest& request)
 }
 
 #if ENABLE(VIDEO_TRACK)
-CachedCues* CachedResourceLoader::requestCues(ResourceRequest& request)
+CachedTextTrack* CachedResourceLoader::requestCues(ResourceRequest& request)
 {
-    return static_cast<CachedCues*>(requestResource(CachedResource::CueResource, request, String(), defaultCachedResourceOptions()));
+    return static_cast<CachedTextTrack*>(requestResource(CachedResource::CueResource, request, String(), defaultCachedResourceOptions()));
 }
 #endif
 
index 0ac04ac..8403730 100644 (file)
 
 namespace WebCore {
 
-class CachedCues;
 class CachedCSSStyleSheet;
 class CachedFont;
 class CachedImage;
 class CachedRawResource;
 class CachedScript;
+class CachedTextTrack;
 class CachedXSLStyleSheet;
 class Document;
 class Frame;
@@ -75,7 +75,7 @@ public:
     CachedResource* requestLinkResource(CachedResource::Type, ResourceRequest&, ResourceLoadPriority = ResourceLoadPriorityUnresolved);
 #endif
 #if ENABLE(VIDEO_TRACK)
-    CachedCues* requestCues(ResourceRequest&);
+    CachedTextTrack* requestCues(ResourceRequest&);
 #endif
 
     // Logs an access denied message to the console for the specified URL.
similarity index 90%
rename from Source/WebCore/loader/cache/CachedCues.cpp
rename to Source/WebCore/loader/cache/CachedTextTrack.cpp
index 1160f9d..ebfbe70 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "CachedCues.h"
+#include "CachedTextTrack.h"
 
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 
 namespace WebCore {
 
-CachedCues::CachedCues(const ResourceRequest& resourceRequest)
+CachedTextTrack::CachedTextTrack(const ResourceRequest& resourceRequest)
     : CachedResource(resourceRequest, CueResource)
 {
 }
 
-CachedCues::~CachedCues()
+CachedTextTrack::~CachedTextTrack()
 {
 }
 
-void CachedCues::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedTextTrack::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
 {
     m_data = data;
     setEncodedSize(m_data.get() ? m_data->size() : 0);
similarity index 89%
rename from Source/WebCore/loader/cache/CachedCues.h
rename to Source/WebCore/loader/cache/CachedTextTrack.h
index a9eab03..2bbc6db 100644 (file)
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedCues_h
-#define CachedCues_h
+#ifndef CachedTextTrack_h
+#define CachedTextTrack_h
 
 #if ENABLE(VIDEO_TRACK)
 
@@ -35,10 +35,10 @@ namespace WebCore {
 
 class SharedBuffer;
 
-class CachedCues : public CachedResource {
+class CachedTextTrack : public CachedResource {
 public:
-    CachedCues(const ResourceRequest&);
-    virtual ~CachedCues();
+    CachedTextTrack(const ResourceRequest&);
+    virtual ~CachedTextTrack();
 
     virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
 };