Unite TextTrack-related files with their friends in WebCore/html/track
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Feb 2012 07:07:21 +0000 (07:07 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Feb 2012 07:07:21 +0000 (07:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78941

Reviewed by Eric Seidel.

The code that supports <track> seems to be split between the
WebCore/html directory and the WebCore/html/track directory.  This
patch unites this code in the WebCore/html/track directory.

* CMakeLists.txt:
* DerivedSources.make:
* DerivedSources.pri:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.xcodeproj/project.pbxproj:
* html/LoadableTextTrack.cpp: Removed.
* html/LoadableTextTrack.h: Removed.
* html/TextTrack.cpp: Removed.
* html/TextTrack.h: Removed.
* html/TextTrack.idl: Removed.
* html/TextTrackCue.cpp: Removed.
* html/TextTrackCue.h: Removed.
* html/TextTrackCue.idl: Removed.
* html/TextTrackCueList.cpp: Removed.
* html/TextTrackCueList.h: Removed.
* html/TextTrackCueList.idl: Removed.
* html/track/LoadableTextTrack.cpp: Copied from Source/WebCore/html/LoadableTextTrack.cpp.
* html/track/LoadableTextTrack.h: Copied from Source/WebCore/html/LoadableTextTrack.h.
* html/track/TextTrack.cpp: Copied from Source/WebCore/html/TextTrack.cpp.
* html/track/TextTrack.h: Copied from Source/WebCore/html/TextTrack.h.
* html/track/TextTrack.idl: Copied from Source/WebCore/html/TextTrack.idl.
* html/track/TextTrackCue.cpp: Copied from Source/WebCore/html/TextTrackCue.cpp.
* html/track/TextTrackCue.h: Copied from Source/WebCore/html/TextTrackCue.h.
* html/track/TextTrackCue.idl: Copied from Source/WebCore/html/TextTrackCue.idl.
* html/track/TextTrackCueList.cpp: Copied from Source/WebCore/html/TextTrackCueList.cpp.
* html/track/TextTrackCueList.h: Copied from Source/WebCore/html/TextTrackCueList.h.
* html/track/TextTrackCueList.idl: Copied from Source/WebCore/html/TextTrackCueList.idl.

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

18 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/DerivedSources.pri
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/track/LoadableTextTrack.cpp [moved from Source/WebCore/html/LoadableTextTrack.cpp with 100% similarity]
Source/WebCore/html/track/LoadableTextTrack.h [moved from Source/WebCore/html/LoadableTextTrack.h with 100% similarity]
Source/WebCore/html/track/TextTrack.cpp [moved from Source/WebCore/html/TextTrack.cpp with 100% similarity]
Source/WebCore/html/track/TextTrack.h [moved from Source/WebCore/html/TextTrack.h with 100% similarity]
Source/WebCore/html/track/TextTrack.idl [moved from Source/WebCore/html/TextTrack.idl with 100% similarity]
Source/WebCore/html/track/TextTrackCue.cpp [moved from Source/WebCore/html/TextTrackCue.cpp with 100% similarity]
Source/WebCore/html/track/TextTrackCue.h [moved from Source/WebCore/html/TextTrackCue.h with 100% similarity]
Source/WebCore/html/track/TextTrackCue.idl [moved from Source/WebCore/html/TextTrackCue.idl with 100% similarity]
Source/WebCore/html/track/TextTrackCueList.cpp [moved from Source/WebCore/html/TextTrackCueList.cpp with 100% similarity]
Source/WebCore/html/track/TextTrackCueList.h [moved from Source/WebCore/html/TextTrackCueList.h with 100% similarity]
Source/WebCore/html/track/TextTrackCueList.idl [moved from Source/WebCore/html/TextTrackCueList.idl with 100% similarity]

index 690b11d..e7c73e6 100644 (file)
@@ -284,9 +284,6 @@ SET(WebCore_IDL_FILES
     html/MediaController.idl
     html/MediaError.idl
     html/TextMetrics.idl
-    html/TextTrack.idl
-    html/TextTrackCue.idl
-    html/TextTrackCueList.idl
     html/TimeRanges.idl
     html/ValidityState.idl
     html/VoidCallback.idl
@@ -311,6 +308,9 @@ SET(WebCore_IDL_FILES
     html/shadow/HTMLContentElement.idl
     html/shadow/HTMLShadowElement.idl
 
+    html/track/TextTrack.idl
+    html/track/TextTrackCue.idl
+    html/track/TextTrackCueList.idl
     html/track/TextTrackList.idl
     html/track/TrackEvent.idl
 
@@ -2113,10 +2113,10 @@ ENDIF ()
 IF (ENABLE_VIDEO_TRACK)
     LIST(APPEND WebCore_SOURCES
         html/HTMLTrackElement.cpp
-        html/LoadableTextTrack.cpp
-        html/TextTrack.cpp
-        html/TextTrackCue.cpp
-        html/TextTrackCueList.cpp
+        html/track/LoadableTextTrack.cpp
+        html/track/TextTrack.cpp
+        html/track/TextTrackCue.cpp
+        html/track/TextTrackCueList.cpp
         html/track/TextTrackList.cpp
         html/track/TrackBase.cpp
         html/track/TrackEvent.cpp
index 62e82f5..de7cea7 100644 (file)
@@ -1,3 +1,43 @@
+2012-02-20  Adam Barth  <abarth@webkit.org>
+
+        Unite TextTrack-related files with their friends in WebCore/html/track
+        https://bugs.webkit.org/show_bug.cgi?id=78941
+
+        Reviewed by Eric Seidel.
+
+        The code that supports <track> seems to be split between the
+        WebCore/html directory and the WebCore/html/track directory.  This
+        patch unites this code in the WebCore/html/track directory.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * DerivedSources.pri:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/LoadableTextTrack.cpp: Removed.
+        * html/LoadableTextTrack.h: Removed.
+        * html/TextTrack.cpp: Removed.
+        * html/TextTrack.h: Removed.
+        * html/TextTrack.idl: Removed.
+        * html/TextTrackCue.cpp: Removed.
+        * html/TextTrackCue.h: Removed.
+        * html/TextTrackCue.idl: Removed.
+        * html/TextTrackCueList.cpp: Removed.
+        * html/TextTrackCueList.h: Removed.
+        * html/TextTrackCueList.idl: Removed.
+        * html/track/LoadableTextTrack.cpp: Copied from Source/WebCore/html/LoadableTextTrack.cpp.
+        * html/track/LoadableTextTrack.h: Copied from Source/WebCore/html/LoadableTextTrack.h.
+        * html/track/TextTrack.cpp: Copied from Source/WebCore/html/TextTrack.cpp.
+        * html/track/TextTrack.h: Copied from Source/WebCore/html/TextTrack.h.
+        * html/track/TextTrack.idl: Copied from Source/WebCore/html/TextTrack.idl.
+        * html/track/TextTrackCue.cpp: Copied from Source/WebCore/html/TextTrackCue.cpp.
+        * html/track/TextTrackCue.h: Copied from Source/WebCore/html/TextTrackCue.h.
+        * html/track/TextTrackCue.idl: Copied from Source/WebCore/html/TextTrackCue.idl.
+        * html/track/TextTrackCueList.cpp: Copied from Source/WebCore/html/TextTrackCueList.cpp.
+        * html/track/TextTrackCueList.h: Copied from Source/WebCore/html/TextTrackCueList.h.
+        * html/track/TextTrackCueList.idl: Copied from Source/WebCore/html/TextTrackCueList.idl.
+
 2012-02-20  Filip Pizlo  <fpizlo@apple.com>
 
         JSC should be a triple-tier VM
index 70fc744..43235f8 100644 (file)
@@ -260,9 +260,6 @@ BINDING_IDLS = \
     $(WebCore)/html/MediaController.idl \
     $(WebCore)/html/MediaError.idl \
     $(WebCore)/html/TextMetrics.idl \
-    $(WebCore)/html/TextTrack.idl \
-    $(WebCore)/html/TextTrackCue.idl \
-    $(WebCore)/html/TextTrackCueList.idl \
     $(WebCore)/html/TimeRanges.idl \
     $(WebCore)/html/ValidityState.idl \
     $(WebCore)/html/canvas/ArrayBuffer.idl \
@@ -300,6 +297,9 @@ BINDING_IDLS = \
     $(WebCore)/html/canvas/WebGLVertexArrayObjectOES.idl \
     $(WebCore)/html/shadow/HTMLContentElement.idl \
     $(WebCore)/html/shadow/HTMLShadowElement.idl \
+    $(WebCore)/html/track/TextTrack.idl \
+    $(WebCore)/html/track/TextTrackCue.idl \
+    $(WebCore)/html/track/TextTrackCueList.idl \
     $(WebCore)/html/track/TextTrackList.idl \
     $(WebCore)/html/track/TrackEvent.idl \
     $(WebCore)/inspector/InjectedScriptHost.idl \
index 610cff1..f060b81 100644 (file)
@@ -599,9 +599,9 @@ contains(DEFINES, ENABLE_SVG=1) {
 
 contains(DEFINES, ENABLE_VIDEO_TRACK=1) {
   IDL_BINDINGS += \
-    $$PWD/html/TextTrack.idl \
-    $$PWD/html/TextTrackCue.idl \
-    $$PWD/html/TextTrackCueList.idl \
+    $$PWD/html/track/TextTrack.idl \
+    $$PWD/html/track/TextTrackCue.idl \
+    $$PWD/html/track/TextTrackCueList.idl \
     $$PWD/html/track/TextTrackList.idl \
     $$PWD/html/track/TrackEvent.idl \
 }
index ea7a329..42fb9fc 100644 (file)
@@ -828,9 +828,6 @@ dom_binding_idls += \
        $(WebCore)/html/MediaController.idl \
        $(WebCore)/html/MediaError.idl \
        $(WebCore)/html/TextMetrics.idl \
-       $(WebCore)/html/TextTrack.idl \
-       $(WebCore)/html/TextTrackCue.idl \
-       $(WebCore)/html/TextTrackCueList.idl \
        $(WebCore)/html/TimeRanges.idl \
        $(WebCore)/html/ValidityState.idl \
        $(WebCore)/html/VoidCallback.idl \
@@ -868,6 +865,9 @@ dom_binding_idls += \
        $(WebCore)/html/canvas/WebGLUniformLocation.idl \
        $(WebCore)/html/canvas/WebGLVertexArrayObjectOES.idl \
        $(WebCore)/html/shadow/HTMLContentElement.idl \
+       $(WebCore)/html/track/TextTrack.idl \
+       $(WebCore)/html/track/TextTrackCue.idl \
+       $(WebCore)/html/track/TextTrackCueList.idl \
        $(WebCore)/html/track/TextTrackList.idl \
        $(WebCore)/html/track/TrackEvent.idl \
        $(WebCore)/inspector/InjectedScriptHost.idl \
@@ -2181,8 +2181,6 @@ webcore_sources += \
        Source/WebCore/html/LabelsNodeList.h \
        Source/WebCore/html/LinkRelAttribute.cpp \
        Source/WebCore/html/LinkRelAttribute.h \
-       Source/WebCore/html/LoadableTextTrack.cpp \
-       Source/WebCore/html/LoadableTextTrack.h \
        Source/WebCore/html/MediaController.cpp \
        Source/WebCore/html/MediaController.h \
        Source/WebCore/html/MediaControllerInterface.h \
@@ -2290,16 +2288,18 @@ webcore_sources += \
        Source/WebCore/html/TextInputType.cpp \
        Source/WebCore/html/TextInputType.h \
        Source/WebCore/html/TextMetrics.h \
-       Source/WebCore/html/TextTrack.cpp \
-       Source/WebCore/html/TextTrack.h \
-       Source/WebCore/html/TextTrackCue.cpp \
-       Source/WebCore/html/TextTrackCue.h \
-       Source/WebCore/html/TextTrackCueList.cpp \
-       Source/WebCore/html/TextTrackCueList.h \
        Source/WebCore/html/TimeInputType.cpp \
        Source/WebCore/html/TimeInputType.h \
        Source/WebCore/html/TimeRanges.cpp \
        Source/WebCore/html/TimeRanges.h \
+       Source/WebCore/html/track/LoadableTextTrack.cpp \
+       Source/WebCore/html/track/LoadableTextTrack.h \
+       Source/WebCore/html/track/TextTrack.cpp \
+       Source/WebCore/html/track/TextTrack.h \
+       Source/WebCore/html/track/TextTrackCue.cpp \
+       Source/WebCore/html/track/TextTrackCue.h \
+       Source/WebCore/html/track/TextTrackCueList.cpp \
+       Source/WebCore/html/track/TextTrackCueList.h \
        Source/WebCore/html/track/TextTrackList.cpp \
        Source/WebCore/html/track/TextTrackList.h \
        Source/WebCore/html/track/TrackBase.cpp \
index ee3c2c5..67464de 100644 (file)
             'html/MediaController.idl',
             'html/MediaError.idl',
             'html/TextMetrics.idl',
-            'html/TextTrack.idl',
-            'html/TextTrackCue.idl',
-            'html/TextTrackCueList.idl',
             'html/TimeRanges.idl',
             'html/ValidityState.idl',
             'html/VoidCallback.idl',
             'html/canvas/WebGLVertexArrayObjectOES.idl',
             'html/shadow/HTMLContentElement.idl',
             'html/shadow/HTMLShadowElement.idl',
+            'html/track/TextTrack.idl',
+            'html/track/TextTrackCue.idl',
+            'html/track/TextTrackCueList.idl',
             'html/track/TextTrackList.idl',
             'html/track/TrackEvent.idl',
             'inspector/InjectedScriptHost.idl',
             'html/LabelsNodeList.h',
             'html/LinkRelAttribute.cpp',
             'html/LinkRelAttribute.h',
-            'html/LoadableTextTrack.cpp',
-            'html/LoadableTextTrack.h',
             'html/MediaController.cpp',
             'html/MediaController.h',
             'html/MediaDocument.cpp',
             'html/TextInputType.cpp',
             'html/TextInputType.h',
             'html/TextMetrics.h',
-            'html/TextTrack.cpp',
-            'html/TextTrack.h',
-            'html/TextTrackCue.cpp',
-            'html/TextTrackCue.h',
-            'html/TextTrackCueList.cpp',
-            'html/TextTrackCueList.h',
             'html/TimeInputType.cpp',
             'html/TimeInputType.h',
             'html/TimeRanges.cpp',
             'html/shadow/SliderThumbElement.h',
             'html/shadow/TextControlInnerElements.cpp',
             'html/shadow/TextControlInnerElements.h',
+            'html/track/LoadableTextTrack.cpp',
+            'html/track/LoadableTextTrack.h',
+            'html/track/TextTrack.cpp',
+            'html/track/TextTrack.h',
+            'html/track/TextTrackCue.cpp',
+            'html/track/TextTrackCue.h',
+            'html/track/TextTrackCueList.cpp',
+            'html/track/TextTrackCueList.h',
             'html/track/TextTrackList.cpp',
             'html/track/TrackBase.cpp',
             'html/track/TrackEvent.cpp',
index 2f406d7..c70d39e 100644 (file)
                974D2DA5146A535D00D51F8B /* SecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 974D2DA3146A535D00D51F8B /* SecurityPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9752D38D1413104B003305BD /* JSHTMLSpanElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9752D38B1413104B003305BD /* JSHTMLSpanElement.cpp */; };
                9752D38E1413104B003305BD /* JSHTMLSpanElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 9752D38C1413104B003305BD /* JSHTMLSpanElement.h */; };
+               9759E93E14EF1CF80026A2DD /* LoadableTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9759E93414EF1CF80026A2DD /* LoadableTextTrack.cpp */; };
+               9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9759E93514EF1CF80026A2DD /* TextTrack.cpp */; };
+               9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 9759E93614EF1CF80026A2DD /* TextTrack.h */; };
+               9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9759E93814EF1CF80026A2DD /* TextTrackCue.cpp */; };
+               9759E94314EF1CF80026A2DD /* TextTrackCue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9759E93914EF1CF80026A2DD /* TextTrackCue.h */; };
+               9759E94514EF1CF80026A2DD /* TextTrackCueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */; };
+               9759E94614EF1CF80026A2DD /* TextTrackCueList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */; };
+               9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 9759E94814EF1D490026A2DD /* LoadableTextTrack.h */; };
                975CA28A130365F800E99AD9 /* Crypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 975CA287130365F800E99AD9 /* Crypto.cpp */; };
                975CA28B130365F800E99AD9 /* Crypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 975CA288130365F800E99AD9 /* Crypto.h */; };
                975CA2A11303679D00E99AD9 /* JSCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 975CA29F1303679D00E99AD9 /* JSCrypto.cpp */; };
                B10B6981140C174000BC1C26 /* WebVTTTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B10B697E140C174000BC1C26 /* WebVTTTokenizer.cpp */; };
                B10B6982140C174000BC1C26 /* WebVTTTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = B10B697F140C174000BC1C26 /* WebVTTTokenizer.h */; };
                B1827493134CA4C100B98C2D /* CallbackFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1827492134CA4C100B98C2D /* CallbackFunction.cpp */; };
-               B1AD4E5E13A12A0B00846B27 /* LoadableTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */; };
-               B1AD4E5F13A12A0B00846B27 /* LoadableTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */; };
-               B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5513A12A0B00846B27 /* TextTrack.cpp */; };
-               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 */; settings = {ATTRIBUTES = (Private, ); }; };
-               B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */; };
-               B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.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 */; };
                0707568A142262D600414161 /* HTMLTrackElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTrackElement.idl; sourceTree = "<group>"; };
                0707568E1422668C00414161 /* JSTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrack.cpp; sourceTree = "<group>"; };
                0707568F1422668C00414161 /* JSTextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrack.h; sourceTree = "<group>"; };
-               0707569C1422979800414161 /* TextTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrack.idl; sourceTree = "<group>"; };
-               0707569D1422979800414161 /* TextTrackCue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackCue.idl; sourceTree = "<group>"; };
-               0707569E1422979800414161 /* TextTrackCueList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackCueList.idl; sourceTree = "<group>"; };
                070756D114239A4E00414161 /* JSHTMLTrackElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTrackElement.cpp; sourceTree = "<group>"; };
                070756D214239A4E00414161 /* JSHTMLTrackElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLTrackElement.h; sourceTree = "<group>"; };
                070756D714239B4B00414161 /* JSTextTrackCue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCue.cpp; sourceTree = "<group>"; };
                974D2DA3146A535D00D51F8B /* SecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityPolicy.h; sourceTree = "<group>"; };
                9752D38B1413104B003305BD /* JSHTMLSpanElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLSpanElement.cpp; sourceTree = "<group>"; };
                9752D38C1413104B003305BD /* JSHTMLSpanElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLSpanElement.h; sourceTree = "<group>"; };
+               9759E93414EF1CF80026A2DD /* LoadableTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableTextTrack.cpp; sourceTree = "<group>"; };
+               9759E93514EF1CF80026A2DD /* TextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrack.cpp; sourceTree = "<group>"; };
+               9759E93614EF1CF80026A2DD /* TextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrack.h; sourceTree = "<group>"; };
+               9759E93714EF1CF80026A2DD /* TextTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrack.idl; sourceTree = "<group>"; };
+               9759E93814EF1CF80026A2DD /* TextTrackCue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCue.cpp; sourceTree = "<group>"; };
+               9759E93914EF1CF80026A2DD /* TextTrackCue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCue.h; sourceTree = "<group>"; };
+               9759E93A14EF1CF80026A2DD /* TextTrackCue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackCue.idl; sourceTree = "<group>"; };
+               9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueList.cpp; sourceTree = "<group>"; };
+               9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueList.h; sourceTree = "<group>"; };
+               9759E93D14EF1CF80026A2DD /* TextTrackCueList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackCueList.idl; sourceTree = "<group>"; };
+               9759E94814EF1D490026A2DD /* LoadableTextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadableTextTrack.h; sourceTree = "<group>"; };
                975CA287130365F800E99AD9 /* Crypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Crypto.cpp; sourceTree = "<group>"; };
                975CA288130365F800E99AD9 /* Crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Crypto.h; sourceTree = "<group>"; };
                975CA289130365F800E99AD9 /* Crypto.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Crypto.idl; sourceTree = "<group>"; };
                B10B697E140C174000BC1C26 /* WebVTTTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTTokenizer.cpp; sourceTree = "<group>"; };
                B10B697F140C174000BC1C26 /* WebVTTTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTTokenizer.h; sourceTree = "<group>"; };
                B1827492134CA4C100B98C2D /* CallbackFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallbackFunction.cpp; 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>"; };
-               B1AD4E5513A12A0B00846B27 /* TextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrack.cpp; sourceTree = "<group>"; };
-               B1AD4E5613A12A0B00846B27 /* TextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrack.h; sourceTree = "<group>"; };
-               B1AD4E5713A12A0B00846B27 /* TextTrackCue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCue.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 /* 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>"; };
                                A456FA2511AD4A830020B420 /* LabelsNodeList.h */,
                                985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */,
                                985BB96C13A94058007A0B69 /* LinkRelAttribute.h */,
-                               B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */,
-                               B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */,
                                CD27F6E6145770D30078207D /* MediaController.cpp */,
                                CD27F6E4145767870078207D /* MediaController.h */,
                                CD27F6E014575C1B0078207D /* MediaController.idl */,
                                F55B3DA61251F12D003EF269 /* TextInputType.h */,
                                BCEF45E80E687767001C1287 /* TextMetrics.h */,
                                BCEF453F0E676AC1001C1287 /* TextMetrics.idl */,
-                               B1AD4E5513A12A0B00846B27 /* TextTrack.cpp */,
-                               B1AD4E5613A12A0B00846B27 /* TextTrack.h */,
-                               0707569C1422979800414161 /* TextTrack.idl */,
-                               B1AD4E5713A12A0B00846B27 /* TextTrackCue.cpp */,
-                               B1AD4E5813A12A0B00846B27 /* TextTrackCue.h */,
-                               0707569D1422979800414161 /* TextTrackCue.idl */,
-                               B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */,
-                               B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.h */,
-                               0707569E1422979800414161 /* TextTrackCueList.idl */,
                                F55B3DA71251F12D003EF269 /* TimeInputType.cpp */,
                                F55B3DA81251F12D003EF269 /* TimeInputType.h */,
                                E446139D0CD6331000FADA75 /* TimeRanges.cpp */,
                B1AD4E7713A12A7200846B27 /* track */ = {
                        isa = PBXGroup;
                        children = (
+                               9759E93414EF1CF80026A2DD /* LoadableTextTrack.cpp */,
+                               9759E94814EF1D490026A2DD /* LoadableTextTrack.h */,
+                               9759E93514EF1CF80026A2DD /* TextTrack.cpp */,
+                               9759E93614EF1CF80026A2DD /* TextTrack.h */,
+                               9759E93714EF1CF80026A2DD /* TextTrack.idl */,
+                               9759E93814EF1CF80026A2DD /* TextTrackCue.cpp */,
+                               9759E93914EF1CF80026A2DD /* TextTrackCue.h */,
+                               9759E93A14EF1CF80026A2DD /* TextTrackCue.idl */,
+                               9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */,
+                               9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */,
+                               9759E93D14EF1CF80026A2DD /* TextTrackCueList.idl */,
                                076970841463AD8700F502CF /* TextTrackList.cpp */,
                                076970851463AD8700F502CF /* TextTrackList.h */,
                                07B5A3061468537100A81ECE /* TextTrackList.idl */,
                                98CE432A129E00E5005821DC /* LinkLoader.h in Headers */,
                                984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */,
                                985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */,
-                               B1AD4E5F13A12A0B00846B27 /* LoadableTextTrack.h in Headers */,
+                               9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */,
                                656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
                                7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
                                06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
                                93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
                                A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
                                B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
-                               B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */,
-                               B1AD4E6913A12A0B00846B27 /* TextTrackCue.h in Headers */,
-                               B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */,
+                               9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,
+                               9759E94314EF1CF80026A2DD /* TextTrackCue.h in Headers */,
+                               9759E94614EF1CF80026A2DD /* TextTrackCueList.h in Headers */,
                                076970871463AD8700F502CF /* TextTrackList.h in Headers */,
                                B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */,
                                498770F11242C535002226BA /* Texture.h in Headers */,
                                A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources */,
                                98CE4326129E00BD005821DC /* LinkLoader.cpp in Sources */,
                                985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */,
-                               B1AD4E5E13A12A0B00846B27 /* LoadableTextTrack.cpp in Sources */,
+                               9759E93E14EF1CF80026A2DD /* LoadableTextTrack.cpp in Sources */,
                                656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.mm in Sources */,
                                7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */,
                                06E81EEC0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm in Sources */,
                                93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */,
                                376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources */,
                                B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
-                               B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */,
-                               B1AD4E6813A12A0B00846B27 /* TextTrackCue.cpp in Sources */,
-                               B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */,
+                               9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
+                               9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
+                               9759E94514EF1CF80026A2DD /* TextTrackCueList.cpp in Sources */,
                                076970861463AD8700F502CF /* TextTrackList.cpp in Sources */,
                                B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */,
                                498770F01242C535002226BA /* Texture.cpp in Sources */,