Changeset 91364 in webkit
- Timestamp:
- Jul 20, 2011 7:55:02 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 deleted
- 26 edited
- 1 copied
- 5 moved
-
CMakeLists.txt (modified) (8 diffs)
-
ChangeLog (modified) (1 diff)
-
CodeGenerators.pri (modified) (3 diffs)
-
DerivedSources.cpp (modified) (4 diffs)
-
DerivedSources.make (modified) (4 diffs)
-
GNUmakefile.list.am (modified) (8 diffs)
-
WebCore.gypi (modified) (7 diffs)
-
WebCore.pro (modified) (8 diffs)
-
WebCore.vcproj/WebCore.vcproj (modified) (9 diffs)
-
WebCore.xcodeproj/project.pbxproj (modified) (25 diffs)
-
bindings/js/JSEventTarget.cpp (modified) (2 diffs)
-
bindings/v8/V8DOMWrapper.cpp (modified) (4 diffs)
-
dom/DOMAllInOne.cpp (modified) (3 diffs)
-
dom/EventTarget.cpp (modified) (1 diff)
-
dom/EventTarget.h (modified) (4 diffs)
-
dom/ExclusiveTrackList.cpp (deleted)
-
dom/LocalMediaStream.cpp (modified) (4 diffs)
-
dom/LocalMediaStream.h (modified) (2 diffs)
-
dom/LocalMediaStream.idl (modified) (2 diffs)
-
dom/MediaStream.cpp (modified) (1 diff)
-
dom/MediaStream.h (modified) (5 diffs)
-
dom/MediaStream.idl (modified) (2 diffs)
-
dom/MediaStreamTrack.cpp (moved) (moved from trunk/Source/WebCore/dom/ExclusiveTrackList.h) (1 diff)
-
dom/MediaStreamTrack.h (moved) (moved from trunk/Source/WebCore/dom/MultipleTrackList.h) (1 diff)
-
dom/MediaStreamTrack.idl (moved) (moved from trunk/Source/WebCore/dom/ExclusiveTrackList.idl) (1 diff)
-
dom/MediaStreamTrackList.cpp (moved) (moved from trunk/Source/WebCore/dom/TrackList.idl) (1 diff)
-
dom/MediaStreamTrackList.h (copied) (copied from trunk/Source/WebCore/dom/ExclusiveTrackList.h) (1 diff)
-
dom/MediaStreamTrackList.idl (moved) (moved from trunk/Source/WebCore/dom/MultipleTrackList.idl) (1 diff)
-
dom/MultipleTrackList.cpp (deleted)
-
dom/TrackList.cpp (deleted)
-
dom/TrackList.h (deleted)
-
page/MediaStreamClient.h (modified) (1 diff)
-
page/MediaStreamController.cpp (modified) (4 diffs)
-
page/MediaStreamController.h (modified) (2 diffs)
-
page/MediaStreamFrameController.cpp (modified) (4 diffs)
-
page/MediaStreamFrameController.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r91331 r91364 156 156 dom/EventException.idl 157 157 dom/Event.idl 158 dom/ExclusiveTrackList.idl159 158 dom/HashChangeEvent.idl 160 159 dom/KeyboardEvent.idl … … 163 162 dom/MessagePort.idl 164 163 dom/MouseEvent.idl 165 dom/MultipleTrackList.idl166 164 dom/MutationEvent.idl 167 165 dom/NamedNodeMap.idl … … 183 181 dom/Touch.idl 184 182 dom/TouchList.idl 185 dom/TrackList.idl186 183 dom/TreeWalker.idl 187 184 dom/UIEvent.idl … … 542 539 dom/ExceptionCode.cpp 543 540 dom/ExceptionCodePlaceholder.cpp 544 dom/ExclusiveTrackList.cpp545 541 dom/IconURL.cpp 546 542 dom/KeyboardEvent.cpp … … 551 547 dom/MouseEvent.cpp 552 548 dom/MouseRelatedEvent.cpp 553 dom/MultipleTrackList.cpp554 549 dom/MutationEvent.cpp 555 550 dom/NamedNodeMap.cpp … … 595 590 dom/TouchEvent.cpp 596 591 dom/TouchList.cpp 597 dom/TrackList.cpp598 592 dom/TransformSourceLibxslt.cpp 599 593 dom/Traversal.cpp … … 2023 2017 dom/MediaStream.cpp 2024 2018 dom/MediaStreamList.cpp 2019 dom/MediaStreamTrack.cpp 2020 dom/MediaStreamTrackList.cpp 2025 2021 dom/StreamEvent.cpp 2026 2022 page/MediaStreamController.cpp … … 2029 2025 2030 2026 LIST(APPEND WebCore_IDL_FILES 2031 dom/GeneratedStream.idl 2032 dom/Stream.idl 2027 dom/LocalMediaStream.idl 2028 dom/MediaStream.idl 2029 dom/MediaStreamList.idl 2030 dom/MediaStreamTrack.idl 2031 dom/MediaStreamTrackList.idl 2033 2032 dom/StreamEvent.idl 2034 dom/StreamList.idl2035 2033 page/NavigatorUserMediaError.idl 2036 2034 ) -
trunk/Source/WebCore/ChangeLog
r91363 r91364 1 2011-07-20 Tommy Widenflycht <tommyw@google.com> 2 3 MediaStream API: Update the tracklists to the latest spec 4 https://bugs.webkit.org/show_bug.cgi?id=64791 5 6 Reviewed by Tony Gentilcore. 7 8 The test harness will be forthcoming very soon now, introducing tests for this. 9 10 * CMakeLists.txt: 11 * CodeGenerators.pri: 12 * DerivedSources.cpp: 13 * DerivedSources.make: 14 * GNUmakefile.list.am: 15 * WebCore.gypi: 16 * WebCore.pro: 17 * WebCore.vcproj/WebCore.vcproj: 18 * WebCore.xcodeproj/project.pbxproj: 19 * bindings/js/JSEventTarget.cpp: 20 (WebCore::toJS): 21 * bindings/v8/V8DOMWrapper.cpp: 22 (WebCore::V8DOMWrapper::convertEventTargetToV8Object): 23 * dom/DOMAllInOne.cpp: 24 * dom/EventTarget.cpp: 25 * dom/EventTarget.h: 26 * dom/ExclusiveTrackList.cpp: Removed. 27 * dom/LocalMediaStream.cpp: 28 (WebCore::LocalMediaStream::create): 29 (WebCore::LocalMediaStream::LocalMediaStream): 30 (WebCore::LocalMediaStream::streamEnded): 31 (WebCore::LocalMediaStream::stop): 32 * dom/LocalMediaStream.h: 33 (WebCore::LocalMediaStream::isLocalMediaStream): 34 * dom/LocalMediaStream.idl: 35 * dom/MediaStream.cpp: 36 (WebCore::MediaStream::create): 37 (WebCore::MediaStream::MediaStream): 38 * dom/MediaStream.h: 39 (WebCore::MediaStream::tracks): 40 * dom/MediaStream.idl: 41 * dom/MediaStreamTrack.cpp: Copied from Source/WebCore/dom/ExclusiveTrackList.h. 42 (WebCore::MediaStreamTrack::create): 43 (WebCore::MediaStreamTrack::MediaStreamTrack): 44 (WebCore::MediaStreamTrack::~MediaStreamTrack): 45 (WebCore::MediaStreamTrack::kind): 46 (WebCore::MediaStreamTrack::label): 47 (WebCore::MediaStreamTrack::enabled): 48 (WebCore::MediaStreamTrack::setEnabled): 49 * dom/MediaStreamTrack.h: Renamed from Source/WebCore/dom/MultipleTrackList.h. 50 * dom/MediaStreamTrack.idl: Renamed from Source/WebCore/dom/ExclusiveTrackList.idl. 51 * dom/MediaStreamTrackList.cpp: Renamed from Source/WebCore/dom/ExclusiveTrackList.h. 52 (WebCore::MediaStreamTrackList::create): 53 (WebCore::MediaStreamTrackList::MediaStreamTrackList): 54 (WebCore::MediaStreamTrackList::~MediaStreamTrackList): 55 (WebCore::MediaStreamTrackList::length): 56 (WebCore::MediaStreamTrackList::item): 57 * dom/MediaStreamTrackList.h: Renamed from Source/WebCore/dom/TrackList.idl. 58 (WebCore::MediaStreamTrackList::associateStream): 59 * dom/MediaStreamTrackList.idl: Renamed from Source/WebCore/dom/MultipleTrackList.idl. 60 * dom/MultipleTrackList.cpp: Removed. 61 * dom/TrackList.cpp: Removed. 62 * dom/TrackList.h: Removed. 63 * page/MediaStreamClient.h: 64 * page/MediaStreamController.cpp: 65 (WebCore::MediaStreamController::setMediaStreamTrackEnabled): 66 (WebCore::MediaStreamController::streamGenerated): 67 * page/MediaStreamController.h: 68 * page/MediaStreamFrameController.cpp: 69 (WebCore::MediaStreamFrameController::setMediaStreamTrackEnabled): 70 (WebCore::MediaStreamFrameController::streamGenerated): 71 * page/MediaStreamFrameController.h: 72 1 73 2011-07-20 Andrew Wason <rectalogic@rectalogic.com> 2 74 -
trunk/Source/WebCore/CodeGenerators.pri
r91331 r91364 140 140 # dom/EventListener.idl \ 141 141 # dom/EventTarget.idl \ 142 dom/ExclusiveTrackList.idl \143 142 dom/HashChangeEvent.idl \ 144 143 dom/KeyboardEvent.idl \ … … 146 145 dom/MediaStream.idl \ 147 146 dom/MediaStreamList.idl \ 147 dom/MediaStreamTrack.idl \ 148 dom/MediaStreamTrackList.idl \ 148 149 dom/MouseEvent.idl \ 149 150 dom/MessageChannel.idl \ 150 151 dom/MessageEvent.idl \ 151 152 dom/MessagePort.idl \ 152 dom/MultipleTrackList.idl \153 153 dom/MutationEvent.idl \ 154 154 dom/NamedNodeMap.idl \ … … 172 172 dom/TouchEvent.idl \ 173 173 dom/TouchList.idl \ 174 dom/TrackList.idl \175 174 dom/TreeWalker.idl \ 176 175 dom/UIEvent.idl \ -
trunk/Source/WebCore/DerivedSources.cpp
r91331 r91364 115 115 #include "JSEventException.cpp" 116 116 #include "JSEventSource.cpp" 117 #include "JSExclusiveTrackList.cpp"118 117 #include "JSFile.cpp" 119 118 #include "JSFileCallback.cpp" … … 234 233 #include "JSMediaStream.cpp" 235 234 #include "JSMediaStreamList.cpp" 235 #include "JSMediaStreamTrack.cpp" 236 #include "JSMediaStreamTrackList.cpp" 236 237 #include "JSMediaQueryList.cpp" 237 238 #include "JSMemoryInfo.cpp" … … 242 243 #include "JSMetadataCallback.cpp" 243 244 #include "JSMouseEvent.cpp" 244 #include "JSMultipleTrackList.cpp"245 245 #include "JSMutationEvent.cpp" 246 246 #include "JSNamedNodeMap.cpp" … … 447 447 #include "JSTouchEvent.cpp" 448 448 #include "JSTouchList.cpp" 449 #include "JSTrackList.cpp"450 449 #include "JSTreeWalker.cpp" 451 450 #include "JSUint16Array.cpp" -
trunk/Source/WebCore/DerivedSources.make
r91331 r91364 189 189 EventSource \ 190 190 EventTarget \ 191 ExclusiveTrackList \192 191 File \ 193 192 FileCallback \ … … 305 304 MediaStream \ 306 305 MediaStreamList \ 306 MediaStreamTrack \ 307 MediaStreamTrackList \ 307 308 MemoryInfo \ 308 309 MessageChannel \ … … 312 313 MetadataCallback \ 313 314 MouseEvent \ 314 MultipleTrackList \315 315 MutationEvent \ 316 316 NamedNodeMap \ … … 535 535 TouchEvent \ 536 536 TouchList \ 537 TrackList \538 537 TreeWalker \ 539 538 UIEvent \ -
trunk/Source/WebCore/GNUmakefile.list.am
r91331 r91364 161 161 DerivedSources/WebCore/JSEventSource.cpp \ 162 162 DerivedSources/WebCore/JSEventSource.h \ 163 DerivedSources/WebCore/JSExclusiveTrackList.cpp \164 DerivedSources/WebCore/JSExclusiveTrackList.h \165 163 DerivedSources/WebCore/JSFile.cpp \ 166 164 DerivedSources/WebCore/JSFileError.cpp \ … … 360 358 DerivedSources/WebCore/JSMediaStreamList.cpp \ 361 359 DerivedSources/WebCore/JSMediaStreamList.h \ 360 DerivedSources/WebCore/JSMediaStreamTrack.cpp \ 361 DerivedSources/WebCore/JSMediaStreamTrack.h \ 362 DerivedSources/WebCore/JSMediaStreamTrackList.cpp \ 363 DerivedSources/WebCore/JSMediaStreamTrackList.h \ 362 364 DerivedSources/WebCore/JSMediaQueryList.cpp \ 363 365 DerivedSources/WebCore/JSMediaQueryList.h \ … … 372 374 DerivedSources/WebCore/JSMouseEvent.cpp \ 373 375 DerivedSources/WebCore/JSMouseEvent.h \ 374 DerivedSources/WebCore/JSMultipleTrackList.cpp \375 DerivedSources/WebCore/JSMultipleTrackList.h \376 376 DerivedSources/WebCore/JSMutationEvent.cpp \ 377 377 DerivedSources/WebCore/JSMutationEvent.h \ … … 488 488 DerivedSources/WebCore/JSTouchList.cpp \ 489 489 DerivedSources/WebCore/JSTouchList.h \ 490 DerivedSources/WebCore/JSTrackList.cpp \491 DerivedSources/WebCore/JSTrackList.h \492 490 DerivedSources/WebCore/JSTreeWalker.cpp \ 493 491 DerivedSources/WebCore/JSTreeWalker.h \ … … 1177 1175 Source/WebCore/dom/ExceptionCodePlaceholder.cpp \ 1178 1176 Source/WebCore/dom/ExceptionCodePlaceholder.h \ 1179 Source/WebCore/dom/ExclusiveTrackList.cpp \1180 Source/WebCore/dom/ExclusiveTrackList.h \1181 1177 Source/WebCore/dom/FragmentScriptingPermission.h \ 1182 1178 Source/WebCore/dom/IgnoreDestructiveWriteCountIncrementer.h \ … … 1195 1191 Source/WebCore/dom/MediaStreamList.cpp \ 1196 1192 Source/WebCore/dom/MediaStreamList.h \ 1193 Source/WebCore/dom/MediaStreamTrack.cpp \ 1194 Source/WebCore/dom/MediaStreamTrack.h \ 1195 Source/WebCore/dom/MediaStreamTrackList.cpp \ 1196 Source/WebCore/dom/MediaStreamTrackList.h \ 1197 1197 Source/WebCore/dom/MessageChannel.cpp \ 1198 1198 Source/WebCore/dom/MessageChannel.h \ … … 1207 1207 Source/WebCore/dom/MouseRelatedEvent.cpp \ 1208 1208 Source/WebCore/dom/MouseRelatedEvent.h \ 1209 Source/WebCore/dom/MultipleTrackList.cpp \1210 Source/WebCore/dom/MultipleTrackList.h \1211 1209 Source/WebCore/dom/MutationEvent.cpp \ 1212 1210 Source/WebCore/dom/MutationEvent.h \ … … 1301 1299 Source/WebCore/dom/Text.h \ 1302 1300 Source/WebCore/dom/TouchList.h \ 1303 Source/WebCore/dom/TrackList.cpp \1304 Source/WebCore/dom/TrackList.h \1305 1301 Source/WebCore/dom/TransformSource.h \ 1306 1302 Source/WebCore/dom/TransformSourceLibxslt.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r91359 r91364 1162 1162 'dom/EventListener.idl', 1163 1163 'dom/EventTarget.idl', 1164 'dom/ExclusiveTrackList.idl',1165 1164 'dom/HashChangeEvent.idl', 1166 1165 'dom/KeyboardEvent.idl', … … 1168 1167 'dom/MediaStream.idl', 1169 1168 'dom/MediaStreamList.idl', 1169 'dom/MediaStreamTrack.idl', 1170 'dom/MediaStreamTrackList.idl', 1170 1171 'dom/MessageChannel.idl', 1171 1172 'dom/MessageEvent.idl', 1172 1173 'dom/MessagePort.idl', 1173 1174 'dom/MouseEvent.idl', 1174 'dom/MultipleTrackList.idl',1175 1175 'dom/MutationEvent.idl', 1176 1176 'dom/NamedNodeMap.idl', … … 1195 1195 'dom/TouchEvent.idl', 1196 1196 'dom/TouchList.idl', 1197 'dom/TrackList.idl',1198 1197 'dom/TreeWalker.idl', 1199 1198 'dom/UIEvent.idl', … … 2511 2510 'dom/ExceptionCode.cpp', 2512 2511 'dom/ExceptionCodePlaceholder.cpp', 2513 'dom/ExclusiveTrackList.cpp',2514 'dom/ExclusiveTrackList.h',2515 2512 'dom/HashChangeEvent.h', 2516 2513 'dom/IgnoreDestructiveWriteCountIncrementer.h', … … 2525 2522 'dom/MediaStreamList.cpp', 2526 2523 'dom/MediaStreamList.h', 2524 'dom/MediaStreamTrack.cpp', 2525 'dom/MediaStreamTrack.h', 2526 'dom/MediaStreamTrackList.cpp', 2527 'dom/MediaStreamTrackList.h', 2527 2528 'dom/MessageChannel.cpp', 2528 2529 'dom/MessageChannel.h', … … 2533 2534 'dom/MouseEvent.cpp', 2534 2535 'dom/MouseRelatedEvent.cpp', 2535 'dom/MultipleTrackList.cpp',2536 'dom/MultipleTrackList.h',2537 2536 'dom/MutationEvent.cpp', 2538 2537 'dom/MutationEvent.h', … … 2622 2621 'dom/TouchList.cpp', 2623 2622 'dom/TouchList.h', 2624 'dom/TrackList.cpp',2625 'dom/TrackList.h',2626 2623 'dom/TransformSource.h', 2627 2624 'dom/TransformSourceLibxslt.cpp', -
trunk/Source/WebCore/WebCore.pro
r91363 r91364 499 499 dom/ExceptionCode.cpp \ 500 500 dom/ExceptionCodePlaceholder.cpp \ 501 dom/ExclusiveTrackList.cpp \502 501 dom/IconURL.cpp \ 503 502 dom/KeyboardEvent.cpp \ … … 508 507 dom/MouseEvent.cpp \ 509 508 dom/MouseRelatedEvent.cpp \ 510 dom/MultipleTrackList.cpp \511 509 dom/MutationEvent.cpp \ 512 510 dom/NamedNodeMap.cpp \ … … 553 551 dom/TouchEvent.cpp \ 554 552 dom/TouchList.cpp \ 555 dom/TrackList.cpp \556 553 dom/Traversal.cpp \ 557 554 dom/TreeScope.cpp \ … … 1489 1486 dom/ExceptionBase.h \ 1490 1487 dom/ExceptionCode.h \ 1491 dom/ExclusiveTrackList.h \1492 1488 dom/FragmentScriptingPermission.h \ 1493 1489 dom/KeyboardEvent.h \ … … 1498 1494 dom/MouseEvent.h \ 1499 1495 dom/MouseRelatedEvent.h \ 1500 dom/MultipleTrackList.h \1501 1496 dom/MutationEvent.h \ 1502 1497 dom/NamedNodeMap.h \ … … 1539 1534 dom/TouchEvent.h \ 1540 1535 dom/TouchList.h \ 1541 dom/TrackList.h \1542 1536 dom/TransformSource.h \ 1543 1537 dom/Traversal.h \ … … 3231 3225 dom/MediaStreamContainer.h \ 3232 3226 dom/MediaStreamList.h \ 3227 dom/MediaStreamTrack.h \ 3228 dom/MediaStreamTrackList.h \ 3233 3229 dom/StreamEvent.h \ 3234 3230 page/CallbackTask.h \ … … 3244 3240 dom/MediaStream.cpp \ 3245 3241 dom/MediaStreamList.cpp \ 3242 dom/MediaStreamTrack.cpp \ 3243 dom/MediaStreamTrackList.cpp \ 3246 3244 dom/StreamEvent.cpp \ 3247 3245 page/MediaStreamController.cpp \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r91359 r91364 4879 4879 </File> 4880 4880 <File 4881 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSExclusiveTrackList.cpp"4882 >4883 <FileConfiguration4884 Name="Debug|Win32"4885 ExcludedFromBuild="true"4886 >4887 <Tool4888 Name="VCCLCompilerTool"4889 />4890 </FileConfiguration>4891 <FileConfiguration4892 Name="Release|Win32"4893 ExcludedFromBuild="true"4894 >4895 <Tool4896 Name="VCCLCompilerTool"4897 />4898 </FileConfiguration>4899 <FileConfiguration4900 Name="Debug_Cairo_CFLite|Win32"4901 ExcludedFromBuild="true"4902 >4903 <Tool4904 Name="VCCLCompilerTool"4905 />4906 </FileConfiguration>4907 <FileConfiguration4908 Name="Release_Cairo_CFLite|Win32"4909 ExcludedFromBuild="true"4910 >4911 <Tool4912 Name="VCCLCompilerTool"4913 />4914 </FileConfiguration>4915 <FileConfiguration4916 Name="Debug_All|Win32"4917 ExcludedFromBuild="true"4918 >4919 <Tool4920 Name="VCCLCompilerTool"4921 />4922 </FileConfiguration>4923 <FileConfiguration4924 Name="Production|Win32"4925 ExcludedFromBuild="true"4926 >4927 <Tool4928 Name="VCCLCompilerTool"4929 />4930 </FileConfiguration>4931 </File>4932 <File4933 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSExclusiveTrackList.h"4934 >4935 </File>4936 <File4937 4881 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSFile.cpp" 4938 4882 > … … 11095 11039 </File> 11096 11040 <File 11041 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamTrack.cpp" 11042 > 11043 <FileConfiguration 11044 Name="Debug|Win32" 11045 ExcludedFromBuild="true" 11046 > 11047 <Tool 11048 Name="VCCLCompilerTool" 11049 /> 11050 </FileConfiguration> 11051 <FileConfiguration 11052 Name="Release|Win32" 11053 ExcludedFromBuild="true" 11054 > 11055 <Tool 11056 Name="VCCLCompilerTool" 11057 /> 11058 </FileConfiguration> 11059 <FileConfiguration 11060 Name="Debug_Cairo_CFLite|Win32" 11061 ExcludedFromBuild="true" 11062 > 11063 <Tool 11064 Name="VCCLCompilerTool" 11065 /> 11066 </FileConfiguration> 11067 <FileConfiguration 11068 Name="Release_Cairo_CFLite|Win32" 11069 ExcludedFromBuild="true" 11070 > 11071 <Tool 11072 Name="VCCLCompilerTool" 11073 /> 11074 </FileConfiguration> 11075 <FileConfiguration 11076 Name="Debug_All|Win32" 11077 ExcludedFromBuild="true" 11078 > 11079 <Tool 11080 Name="VCCLCompilerTool" 11081 /> 11082 </FileConfiguration> 11083 <FileConfiguration 11084 Name="Production|Win32" 11085 ExcludedFromBuild="true" 11086 > 11087 <Tool 11088 Name="VCCLCompilerTool" 11089 /> 11090 </FileConfiguration> 11091 </File> 11092 <File 11093 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamTrack.h" 11094 > 11095 </File> 11096 <File 11097 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamTrackList.cpp" 11098 > 11099 <FileConfiguration 11100 Name="Debug|Win32" 11101 ExcludedFromBuild="true" 11102 > 11103 <Tool 11104 Name="VCCLCompilerTool" 11105 /> 11106 </FileConfiguration> 11107 <FileConfiguration 11108 Name="Release|Win32" 11109 ExcludedFromBuild="true" 11110 > 11111 <Tool 11112 Name="VCCLCompilerTool" 11113 /> 11114 </FileConfiguration> 11115 <FileConfiguration 11116 Name="Debug_Cairo_CFLite|Win32" 11117 ExcludedFromBuild="true" 11118 > 11119 <Tool 11120 Name="VCCLCompilerTool" 11121 /> 11122 </FileConfiguration> 11123 <FileConfiguration 11124 Name="Release_Cairo_CFLite|Win32" 11125 ExcludedFromBuild="true" 11126 > 11127 <Tool 11128 Name="VCCLCompilerTool" 11129 /> 11130 </FileConfiguration> 11131 <FileConfiguration 11132 Name="Debug_All|Win32" 11133 ExcludedFromBuild="true" 11134 > 11135 <Tool 11136 Name="VCCLCompilerTool" 11137 /> 11138 </FileConfiguration> 11139 <FileConfiguration 11140 Name="Production|Win32" 11141 ExcludedFromBuild="true" 11142 > 11143 <Tool 11144 Name="VCCLCompilerTool" 11145 /> 11146 </FileConfiguration> 11147 </File> 11148 <File 11149 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamTrackList.h" 11150 > 11151 </File> 11152 <File 11097 11153 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMemoryInfo.cpp" 11098 11154 > … … 11487 11543 </File> 11488 11544 <File 11489 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMultipleTrackList.cpp"11490 >11491 <FileConfiguration11492 Name="Debug|Win32"11493 ExcludedFromBuild="true"11494 >11495 <Tool11496 Name="VCCLCompilerTool"11497 />11498 </FileConfiguration>11499 <FileConfiguration11500 Name="Release|Win32"11501 ExcludedFromBuild="true"11502 >11503 <Tool11504 Name="VCCLCompilerTool"11505 />11506 </FileConfiguration>11507 <FileConfiguration11508 Name="Debug_Cairo_CFLite|Win32"11509 ExcludedFromBuild="true"11510 >11511 <Tool11512 Name="VCCLCompilerTool"11513 />11514 </FileConfiguration>11515 <FileConfiguration11516 Name="Release_Cairo_CFLite|Win32"11517 ExcludedFromBuild="true"11518 >11519 <Tool11520 Name="VCCLCompilerTool"11521 />11522 </FileConfiguration>11523 <FileConfiguration11524 Name="Debug_All|Win32"11525 ExcludedFromBuild="true"11526 >11527 <Tool11528 Name="VCCLCompilerTool"11529 />11530 </FileConfiguration>11531 <FileConfiguration11532 Name="Production|Win32"11533 ExcludedFromBuild="true"11534 >11535 <Tool11536 Name="VCCLCompilerTool"11537 />11538 </FileConfiguration>11539 </File>11540 <File11541 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMultipleTrackList.h"11542 >11543 </File>11544 <File11545 11545 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMutationEvent.cpp" 11546 11546 > … … 22068 22068 <File 22069 22069 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTimeRanges.h" 22070 >22071 </File>22072 <File22073 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTrackList.cpp"22074 >22075 <FileConfiguration22076 Name="Debug|Win32"22077 ExcludedFromBuild="true"22078 >22079 <Tool22080 Name="VCCLCompilerTool"22081 />22082 </FileConfiguration>22083 <FileConfiguration22084 Name="Release|Win32"22085 ExcludedFromBuild="true"22086 >22087 <Tool22088 Name="VCCLCompilerTool"22089 />22090 </FileConfiguration>22091 <FileConfiguration22092 Name="Debug_Cairo_CFLite|Win32"22093 ExcludedFromBuild="true"22094 >22095 <Tool22096 Name="VCCLCompilerTool"22097 />22098 </FileConfiguration>22099 <FileConfiguration22100 Name="Release_Cairo_CFLite|Win32"22101 ExcludedFromBuild="true"22102 >22103 <Tool22104 Name="VCCLCompilerTool"22105 />22106 </FileConfiguration>22107 <FileConfiguration22108 Name="Debug_All|Win32"22109 ExcludedFromBuild="true"22110 >22111 <Tool22112 Name="VCCLCompilerTool"22113 />22114 </FileConfiguration>22115 <FileConfiguration22116 Name="Production|Win32"22117 ExcludedFromBuild="true"22118 >22119 <Tool22120 Name="VCCLCompilerTool"22121 />22122 </FileConfiguration>22123 </File>22124 <File22125 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTrackList.h"22126 22070 > 22127 22071 </File> … … 45679 45623 </File> 45680 45624 <File 45681 RelativePath="..\dom\ExclusiveTrackList.cpp"45682 >45683 <FileConfiguration45684 Name="Debug|Win32"45685 ExcludedFromBuild="true"45686 >45687 <Tool45688 Name="VCCLCompilerTool"45689 />45690 </FileConfiguration>45691 <FileConfiguration45692 Name="Release|Win32"45693 ExcludedFromBuild="true"45694 >45695 <Tool45696 Name="VCCLCompilerTool"45697 />45698 </FileConfiguration>45699 <FileConfiguration45700 Name="Debug_Cairo_CFLite|Win32"45701 ExcludedFromBuild="true"45702 >45703 <Tool45704 Name="VCCLCompilerTool"45705 />45706 </FileConfiguration>45707 <FileConfiguration45708 Name="Release_Cairo_CFLite|Win32"45709 ExcludedFromBuild="true"45710 >45711 <Tool45712 Name="VCCLCompilerTool"45713 />45714 </FileConfiguration>45715 <FileConfiguration45716 Name="Debug_All|Win32"45717 ExcludedFromBuild="true"45718 >45719 <Tool45720 Name="VCCLCompilerTool"45721 />45722 </FileConfiguration>45723 <FileConfiguration45724 Name="Production|Win32"45725 ExcludedFromBuild="true"45726 >45727 <Tool45728 Name="VCCLCompilerTool"45729 />45730 </FileConfiguration>45731 </File>45732 <File45733 45625 RelativePath="..\dom\ExceptionCodePlaceholder.cpp" 45734 45626 > … … 45787 45679 </File> 45788 45680 <File 45789 RelativePath="..\dom\ExclusiveTrackList.cpp"45790 >45791 <FileConfiguration45792 Name="Debug|Win32"45793 ExcludedFromBuild="true"45794 >45795 <Tool45796 Name="VCCLCompilerTool"45797 />45798 </FileConfiguration>45799 <FileConfiguration45800 Name="Release|Win32"45801 ExcludedFromBuild="true"45802 >45803 <Tool45804 Name="VCCLCompilerTool"45805 />45806 </FileConfiguration>45807 <FileConfiguration45808 Name="Debug_Cairo_CFLite|Win32"45809 ExcludedFromBuild="true"45810 >45811 <Tool45812 Name="VCCLCompilerTool"45813 />45814 </FileConfiguration>45815 <FileConfiguration45816 Name="Release_Cairo_CFLite|Win32"45817 ExcludedFromBuild="true"45818 >45819 <Tool45820 Name="VCCLCompilerTool"45821 />45822 </FileConfiguration>45823 <FileConfiguration45824 Name="Debug_All|Win32"45825 ExcludedFromBuild="true"45826 >45827 <Tool45828 Name="VCCLCompilerTool"45829 />45830 </FileConfiguration>45831 <FileConfiguration45832 Name="Production|Win32"45833 ExcludedFromBuild="true"45834 >45835 <Tool45836 Name="VCCLCompilerTool"45837 />45838 </FileConfiguration>45839 </File>45840 <File45841 RelativePath="..\dom\ExclusiveTrackList.h"45842 >45843 </File>45844 <File45845 45681 RelativePath="..\dom\HashChangeEvent.h" 45846 45682 > … … 46139 45975 </File> 46140 45976 <File 45977 RelativePath="..\dom\MediaStreamTrack.cpp" 45978 > 45979 <FileConfiguration 45980 Name="Debug|Win32" 45981 ExcludedFromBuild="true" 45982 > 45983 <Tool 45984 Name="VCCLCompilerTool" 45985 /> 45986 </FileConfiguration> 45987 <FileConfiguration 45988 Name="Release|Win32" 45989 ExcludedFromBuild="true" 45990 > 45991 <Tool 45992 Name="VCCLCompilerTool" 45993 /> 45994 </FileConfiguration> 45995 <FileConfiguration 45996 Name="Debug_Cairo_CFLite|Win32" 45997 ExcludedFromBuild="true" 45998 > 45999 <Tool 46000 Name="VCCLCompilerTool" 46001 /> 46002 </FileConfiguration> 46003 <FileConfiguration 46004 Name="Release_Cairo_CFLite|Win32" 46005 ExcludedFromBuild="true" 46006 > 46007 <Tool 46008 Name="VCCLCompilerTool" 46009 /> 46010 </FileConfiguration> 46011 <FileConfiguration 46012 Name="Debug_All|Win32" 46013 ExcludedFromBuild="true" 46014 > 46015 <Tool 46016 Name="VCCLCompilerTool" 46017 /> 46018 </FileConfiguration> 46019 <FileConfiguration 46020 Name="Production|Win32" 46021 ExcludedFromBuild="true" 46022 > 46023 <Tool 46024 Name="VCCLCompilerTool" 46025 /> 46026 </FileConfiguration> 46027 </File> 46028 <File 46029 RelativePath="..\dom\MediaStreamTrack.h" 46030 > 46031 </File> 46032 <File 46033 RelativePath="..\dom\MediaStreamTrackList.cpp" 46034 > 46035 <FileConfiguration 46036 Name="Debug|Win32" 46037 ExcludedFromBuild="true" 46038 > 46039 <Tool 46040 Name="VCCLCompilerTool" 46041 /> 46042 </FileConfiguration> 46043 <FileConfiguration 46044 Name="Release|Win32" 46045 ExcludedFromBuild="true" 46046 > 46047 <Tool 46048 Name="VCCLCompilerTool" 46049 /> 46050 </FileConfiguration> 46051 <FileConfiguration 46052 Name="Debug_Cairo_CFLite|Win32" 46053 ExcludedFromBuild="true" 46054 > 46055 <Tool 46056 Name="VCCLCompilerTool" 46057 /> 46058 </FileConfiguration> 46059 <FileConfiguration 46060 Name="Release_Cairo_CFLite|Win32" 46061 ExcludedFromBuild="true" 46062 > 46063 <Tool 46064 Name="VCCLCompilerTool" 46065 /> 46066 </FileConfiguration> 46067 <FileConfiguration 46068 Name="Debug_All|Win32" 46069 ExcludedFromBuild="true" 46070 > 46071 <Tool 46072 Name="VCCLCompilerTool" 46073 /> 46074 </FileConfiguration> 46075 <FileConfiguration 46076 Name="Production|Win32" 46077 ExcludedFromBuild="true" 46078 > 46079 <Tool 46080 Name="VCCLCompilerTool" 46081 /> 46082 </FileConfiguration> 46083 </File> 46084 <File 46085 RelativePath="..\dom\MediaStreamTrackList.h" 46086 > 46087 </File> 46088 <File 46141 46089 RelativePath="..\dom\MessageChannel.cpp" 46142 46090 > … … 46475 46423 </File> 46476 46424 <File 46477 RelativePath="..\dom\MultipleTrackList.cpp"46478 >46479 <FileConfiguration46480 Name="Debug|Win32"46481 ExcludedFromBuild="true"46482 >46483 <Tool46484 Name="VCCLCompilerTool"46485 />46486 </FileConfiguration>46487 <FileConfiguration46488 Name="Release|Win32"46489 ExcludedFromBuild="true"46490 >46491 <Tool46492 Name="VCCLCompilerTool"46493 />46494 </FileConfiguration>46495 <FileConfiguration46496 Name="Debug_Cairo_CFLite|Win32"46497 ExcludedFromBuild="true"46498 >46499 <Tool46500 Name="VCCLCompilerTool"46501 />46502 </FileConfiguration>46503 <FileConfiguration46504 Name="Release_Cairo_CFLite|Win32"46505 ExcludedFromBuild="true"46506 >46507 <Tool46508 Name="VCCLCompilerTool"46509 />46510 </FileConfiguration>46511 <FileConfiguration46512 Name="Debug_All|Win32"46513 ExcludedFromBuild="true"46514 >46515 <Tool46516 Name="VCCLCompilerTool"46517 />46518 </FileConfiguration>46519 <FileConfiguration46520 Name="Production|Win32"46521 ExcludedFromBuild="true"46522 >46523 <Tool46524 Name="VCCLCompilerTool"46525 />46526 </FileConfiguration>46527 </File>46528 <File46529 RelativePath="..\dom\MultipleTrackList.h"46530 >46531 </File>46532 <File46533 46425 RelativePath="..\dom\MutationEvent.cpp" 46534 46426 > … … 48820 48712 <File 48821 48713 RelativePath="..\dom\TextEventInputType.h" 48822 >48823 </File>48824 <File48825 RelativePath="..\dom\TrackList.cpp"48826 >48827 <FileConfiguration48828 Name="Debug|Win32"48829 ExcludedFromBuild="true"48830 >48831 <Tool48832 Name="VCCLCompilerTool"48833 />48834 </FileConfiguration>48835 <FileConfiguration48836 Name="Release|Win32"48837 ExcludedFromBuild="true"48838 >48839 <Tool48840 Name="VCCLCompilerTool"48841 />48842 </FileConfiguration>48843 <FileConfiguration48844 Name="Debug_Cairo_CFLite|Win32"48845 ExcludedFromBuild="true"48846 >48847 <Tool48848 Name="VCCLCompilerTool"48849 />48850 </FileConfiguration>48851 <FileConfiguration48852 Name="Release_Cairo_CFLite|Win32"48853 ExcludedFromBuild="true"48854 >48855 <Tool48856 Name="VCCLCompilerTool"48857 />48858 </FileConfiguration>48859 <FileConfiguration48860 Name="Debug_All|Win32"48861 ExcludedFromBuild="true"48862 >48863 <Tool48864 Name="VCCLCompilerTool"48865 />48866 </FileConfiguration>48867 <FileConfiguration48868 Name="Production|Win32"48869 ExcludedFromBuild="true"48870 >48871 <Tool48872 Name="VCCLCompilerTool"48873 />48874 </FileConfiguration>48875 </File>48876 <File48877 RelativePath="..\dom\TrackList.h"48878 48714 > 48879 48715 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r91331 r91364 1177 1177 49C7BA791042EFAE0009D447 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49C7BA781042EFAE0009D447 /* OpenGL.framework */; }; 1178 1178 49C7BA8D1042F5B10009D447 /* JSDocumentCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C7BA8C1042F5B10009D447 /* JSDocumentCustom.cpp */; }; 1179 49C9F32313D574F90052600A /* MediaStreamTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = 49C9F31D13D574F80052600A /* MediaStreamTrackList.h */; }; 1180 49C9F32413D574F90052600A /* MediaStreamTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C9F31E13D574F80052600A /* MediaStreamTrackList.cpp */; }; 1181 49C9F32613D574F90052600A /* MediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 49C9F32013D574F90052600A /* MediaStreamTrack.h */; }; 1182 49C9F32713D574F90052600A /* MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C9F32113D574F90052600A /* MediaStreamTrack.cpp */; }; 1183 49C9F48E13D57D320052600A /* JSMediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C9F48A13D57D320052600A /* JSMediaStreamTrack.cpp */; }; 1184 49C9F48F13D57D320052600A /* JSMediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 49C9F48B13D57D320052600A /* JSMediaStreamTrack.h */; }; 1185 49C9F49013D57D320052600A /* JSMediaStreamTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C9F48C13D57D320052600A /* JSMediaStreamTrackList.cpp */; }; 1186 49C9F49113D57D320052600A /* JSMediaStreamTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = 49C9F48D13D57D320052600A /* JSMediaStreamTrackList.h */; }; 1179 1187 49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49D5DC270F423A73008F20FD /* Matrix3DTransformOperation.cpp */; }; 1180 1188 49D5DC2C0F423A73008F20FD /* Matrix3DTransformOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 49D5DC280F423A73008F20FD /* Matrix3DTransformOperation.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 4047 4055 ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; }; 4048 4056 ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */; }; 4049 B12D233E13560282002A28D4 /* ExclusiveTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B12D233513560282002A28D4 /* ExclusiveTrackList.cpp */; };4050 B12D233F13560282002A28D4 /* ExclusiveTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B12D233613560282002A28D4 /* ExclusiveTrackList.h */; };4051 B12D234113560282002A28D4 /* MultipleTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B12D233813560282002A28D4 /* MultipleTrackList.cpp */; };4052 B12D234213560282002A28D4 /* MultipleTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B12D233913560282002A28D4 /* MultipleTrackList.h */; };4053 B12D234413560282002A28D4 /* TrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B12D233B13560282002A28D4 /* TrackList.cpp */; };4054 B12D234513560282002A28D4 /* TrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B12D233C13560282002A28D4 /* TrackList.h */; };4055 B12D236513560330002A28D4 /* JSTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B12D23631356032F002A28D4 /* JSTrackList.cpp */; };4056 B12D236613560330002A28D4 /* JSTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B12D236413560330002A28D4 /* JSTrackList.h */; };4057 B12D23691356033F002A28D4 /* JSExclusiveTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B12D23671356033F002A28D4 /* JSExclusiveTrackList.cpp */; };4058 B12D236A1356033F002A28D4 /* JSExclusiveTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B12D23681356033F002A28D4 /* JSExclusiveTrackList.h */; };4059 B12D236D1356034D002A28D4 /* JSMultipleTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B12D236B1356034D002A28D4 /* JSMultipleTrackList.cpp */; };4060 B12D236E1356034D002A28D4 /* JSMultipleTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B12D236C1356034D002A28D4 /* JSMultipleTrackList.h */; };4061 4057 B14353D4138EA8ED00D53276 /* MediaStreamContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = B14353D0138EA8ED00D53276 /* MediaStreamContainer.h */; }; 4062 4058 B14353D5138EA8ED00D53276 /* MediaStreamList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B14353D1138EA8ED00D53276 /* MediaStreamList.cpp */; }; … … 7734 7730 49C7BA781042EFAE0009D447 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 7735 7731 49C7BA8C1042F5B10009D447 /* JSDocumentCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentCustom.cpp; sourceTree = "<group>"; }; 7732 49C9F31C13D574F80052600A /* MediaStreamTrackList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaStreamTrackList.idl; sourceTree = "<group>"; }; 7733 49C9F31D13D574F80052600A /* MediaStreamTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamTrackList.h; sourceTree = "<group>"; }; 7734 49C9F31E13D574F80052600A /* MediaStreamTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamTrackList.cpp; sourceTree = "<group>"; }; 7735 49C9F31F13D574F80052600A /* MediaStreamTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaStreamTrack.idl; sourceTree = "<group>"; }; 7736 49C9F32013D574F90052600A /* MediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamTrack.h; sourceTree = "<group>"; }; 7737 49C9F32113D574F90052600A /* MediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamTrack.cpp; sourceTree = "<group>"; }; 7738 49C9F48A13D57D320052600A /* JSMediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrack.cpp; sourceTree = "<group>"; }; 7739 49C9F48B13D57D320052600A /* JSMediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrack.h; sourceTree = "<group>"; }; 7740 49C9F48C13D57D320052600A /* JSMediaStreamTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackList.cpp; sourceTree = "<group>"; }; 7741 49C9F48D13D57D320052600A /* JSMediaStreamTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackList.h; sourceTree = "<group>"; }; 7736 7742 49D5DC270F423A73008F20FD /* Matrix3DTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Matrix3DTransformOperation.cpp; path = transforms/Matrix3DTransformOperation.cpp; sourceTree = "<group>"; }; 7737 7743 49D5DC280F423A73008F20FD /* Matrix3DTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Matrix3DTransformOperation.h; path = transforms/Matrix3DTransformOperation.h; sourceTree = "<group>"; }; … … 10532 10538 ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGPath.cpp; sourceTree = "<group>"; }; 10533 10539 ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGPath.h; sourceTree = "<group>"; }; 10534 B12D233513560282002A28D4 /* ExclusiveTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExclusiveTrackList.cpp; sourceTree = "<group>"; };10535 B12D233613560282002A28D4 /* ExclusiveTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExclusiveTrackList.h; sourceTree = "<group>"; };10536 B12D233713560282002A28D4 /* ExclusiveTrackList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ExclusiveTrackList.idl; sourceTree = "<group>"; };10537 B12D233813560282002A28D4 /* MultipleTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultipleTrackList.cpp; sourceTree = "<group>"; };10538 B12D233913560282002A28D4 /* MultipleTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultipleTrackList.h; sourceTree = "<group>"; };10539 B12D233A13560282002A28D4 /* MultipleTrackList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MultipleTrackList.idl; sourceTree = "<group>"; };10540 B12D233B13560282002A28D4 /* TrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackList.cpp; sourceTree = "<group>"; };10541 B12D233C13560282002A28D4 /* TrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackList.h; sourceTree = "<group>"; };10542 B12D233D13560282002A28D4 /* TrackList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TrackList.idl; sourceTree = "<group>"; };10543 B12D23631356032F002A28D4 /* JSTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackList.cpp; sourceTree = "<group>"; };10544 B12D236413560330002A28D4 /* JSTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTrackList.h; sourceTree = "<group>"; };10545 B12D23671356033F002A28D4 /* JSExclusiveTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSExclusiveTrackList.cpp; sourceTree = "<group>"; };10546 B12D23681356033F002A28D4 /* JSExclusiveTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExclusiveTrackList.h; sourceTree = "<group>"; };10547 B12D236B1356034D002A28D4 /* JSMultipleTrackList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMultipleTrackList.cpp; sourceTree = "<group>"; };10548 B12D236C1356034D002A28D4 /* JSMultipleTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMultipleTrackList.h; sourceTree = "<group>"; };10549 10540 B14353D0138EA8ED00D53276 /* MediaStreamContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamContainer.h; sourceTree = "<group>"; }; 10550 10541 B14353D1138EA8ED00D53276 /* MediaStreamList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamList.cpp; sourceTree = "<group>"; }; … … 17237 17228 93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */, 17238 17229 93F9B7730BA5FDDC00854064 /* JSEntityReference.h */, 17239 B12D23671356033F002A28D4 /* JSExclusiveTrackList.cpp */,17240 B12D23681356033F002A28D4 /* JSExclusiveTrackList.h */,17241 17230 FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */, 17242 17231 FE80DA600E9C4703000D6F75 /* JSGeolocation.h */, … … 17249 17238 B14353F6138EA95B00D53276 /* JSMediaStreamList.cpp */, 17250 17239 B14353F7138EA95B00D53276 /* JSMediaStreamList.h */, 17251 B12D236B1356034D002A28D4 /* JSMultipleTrackList.cpp */, 17252 B12D236C1356034D002A28D4 /* JSMultipleTrackList.h */, 17240 49C9F48A13D57D320052600A /* JSMediaStreamTrack.cpp */, 17241 49C9F48B13D57D320052600A /* JSMediaStreamTrack.h */, 17242 49C9F48C13D57D320052600A /* JSMediaStreamTrackList.cpp */, 17243 49C9F48D13D57D320052600A /* JSMediaStreamTrackList.h */, 17253 17244 BCD9C2BC0C17B69E005C90A2 /* JSNamedNodeMap.cpp */, 17254 17245 BCD9C2BD0C17B69E005C90A2 /* JSNamedNodeMap.h */, … … 17279 17270 65DF31EF09D1CC60000BE325 /* JSText.cpp */, 17280 17271 65DF31F009D1CC60000BE325 /* JSText.h */, 17281 B12D23631356032F002A28D4 /* JSTrackList.cpp */,17282 B12D236413560330002A28D4 /* JSTrackList.h */,17283 17272 ); 17284 17273 name = Core; … … 19756 19745 A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */, 19757 19746 A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */, 19758 B12D233513560282002A28D4 /* ExclusiveTrackList.cpp */,19759 B12D233613560282002A28D4 /* ExclusiveTrackList.h */,19760 B12D233713560282002A28D4 /* ExclusiveTrackList.idl */,19761 19747 A853123C11D0471B00D4D077 /* FragmentScriptingPermission.h */, 19762 19748 2442BBF81194C9D300D49469 /* HashChangeEvent.h */, … … 19779 19765 B14353D2138EA8ED00D53276 /* MediaStreamList.h */, 19780 19766 B14353D3138EA8ED00D53276 /* MediaStreamList.idl */, 19767 49C9F31F13D574F80052600A /* MediaStreamTrack.idl */, 19768 49C9F32013D574F90052600A /* MediaStreamTrack.h */, 19769 49C9F32113D574F90052600A /* MediaStreamTrack.cpp */, 19770 49C9F31C13D574F80052600A /* MediaStreamTrackList.idl */, 19771 49C9F31D13D574F80052600A /* MediaStreamTrackList.h */, 19772 49C9F31E13D574F80052600A /* MediaStreamTrackList.cpp */, 19781 19773 E1ADECCD0E76AD8B004A1A5E /* MessageChannel.cpp */, 19782 19774 E1ADECCC0E76AD8B004A1A5E /* MessageChannel.h */, … … 19795 19787 85031B310A44EFC700F992E0 /* MouseRelatedEvent.cpp */, 19796 19788 85031B320A44EFC700F992E0 /* MouseRelatedEvent.h */, 19797 B12D233813560282002A28D4 /* MultipleTrackList.cpp */,19798 B12D233913560282002A28D4 /* MultipleTrackList.h */,19799 B12D233A13560282002A28D4 /* MultipleTrackList.idl */,19800 19789 85031B330A44EFC700F992E0 /* MutationEvent.cpp */, 19801 19790 85031B340A44EFC700F992E0 /* MutationEvent.h */, … … 19911 19900 933A142C0B7D188600A53FFD /* TextEvent.idl */, 19912 19901 A77B419F12E675A90054343D /* TextEventInputType.h */, 19913 B12D233B13560282002A28D4 /* TrackList.cpp */,19914 B12D233C13560282002A28D4 /* TrackList.h */,19915 B12D233D13560282002A28D4 /* TrackList.idl */,19916 19902 5DB1BC6810715A6400EFAA49 /* TransformSource.h */, 19917 19903 5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */, … … 21268 21254 A74BB76B13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h in Headers */, 21269 21255 148AFDA50AF58360008CC700 /* ExceptionHandlers.h in Headers */, 21270 B12D233F13560282002A28D4 /* ExclusiveTrackList.h in Headers */,21271 21256 6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */, 21272 21257 6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */, … … 21781 21766 BC60901F0E91B8EC000C68B5 /* JSEventTarget.h in Headers */, 21782 21767 3314ACEC10892086000F0E56 /* JSExceptionBase.h in Headers */, 21783 B12D236A1356033F002A28D4 /* JSExclusiveTrackList.h in Headers */,21784 21768 BC00F0150E0A189500FD04E3 /* JSFile.h in Headers */, 21785 21769 893C47B81238A099002B3D86 /* JSFileCallback.h in Headers */, … … 21917 21901 898785B9122CA2A7003AABDA /* JSMetadataCallback.h in Headers */, 21918 21902 A86629D109DA2B48009633A5 /* JSMouseEvent.h in Headers */, 21919 B12D236E1356034D002A28D4 /* JSMultipleTrackList.h in Headers */,21920 21903 65DF31FC09D1CC60000BE325 /* JSMutationEvent.h in Headers */, 21921 21904 BCD9C2C10C17B69E005C90A2 /* JSNamedNodeMap.h in Headers */, … … 22128 22111 BCEF45F60E687B5C001C1287 /* JSTextMetrics.h in Headers */, 22129 22112 E446141B0CD6826900FADA75 /* JSTimeRanges.h in Headers */, 22130 B12D236613560330002A28D4 /* JSTrackList.h in Headers */,22131 22113 1A750D5D0A90DEE1000FF215 /* JSTreeWalker.h in Headers */, 22132 22114 A86629CF09DA2B47009633A5 /* JSUIEvent.h in Headers */, … … 22283 22265 85031B480A44EFC700F992E0 /* MouseRelatedEvent.h in Headers */, 22284 22266 93309DFC099E64920056E581 /* MoveSelectionCommand.h in Headers */, 22285 B12D234213560282002A28D4 /* MultipleTrackList.h in Headers */,22286 22267 B1AD4E6313A12A0B00846B27 /* MutableTextTrack.h in Headers */, 22287 22268 85031B4A0A44EFC700F992E0 /* MutationEvent.h in Headers */, … … 23066 23047 E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */, 23067 23048 49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */, 23068 B12D234513560282002A28D4 /* TrackList.h in Headers */,23069 23049 49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */, 23070 23050 49E911CE0EF86D47009D0CAF /* TransformOperation.h in Headers */, … … 23238 23218 FD82D7F813D4C8BD004E4372 /* JSWaveShaperNode.h in Headers */, 23239 23219 5913A24213D49EBA00F5B05C /* IdentifiersFactory.h in Headers */, 23220 49C9F32313D574F90052600A /* MediaStreamTrackList.h in Headers */, 23221 49C9F32613D574F90052600A /* MediaStreamTrack.h in Headers */, 23222 49C9F48F13D57D320052600A /* JSMediaStreamTrack.h in Headers */, 23223 49C9F49113D57D320052600A /* JSMediaStreamTrackList.h in Headers */, 23240 23224 ); 23241 23225 runOnlyForDeploymentPostprocessing = 0; … … 24201 24185 A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */, 24202 24186 148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */, 24203 B12D233E13560282002A28D4 /* ExclusiveTrackList.cpp in Sources */,24204 24187 6E67D2A61280E8A4008758F7 /* Extensions3DOpenGL.cpp in Sources */, 24205 24188 A75E8B880E1DE2D6007F2481 /* FEBlend.cpp in Sources */, … … 24709 24692 BC6090200E91B8EC000C68B5 /* JSEventTarget.cpp in Sources */, 24710 24693 3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */, 24711 B12D23691356033F002A28D4 /* JSExclusiveTrackList.cpp in Sources */,24712 24694 BC00F0140E0A189500FD04E3 /* JSFile.cpp in Sources */, 24713 24695 893C47B71238A099002B3D86 /* JSFileCallback.cpp in Sources */, … … 24879 24861 898785B8122CA2A7003AABDA /* JSMetadataCallback.cpp in Sources */, 24880 24862 A86629D209DA2B48009633A5 /* JSMouseEvent.cpp in Sources */, 24881 B12D236D1356034D002A28D4 /* JSMultipleTrackList.cpp in Sources */,24882 24863 65DF31FB09D1CC60000BE325 /* JSMutationEvent.cpp in Sources */, 24883 24864 BCD9C2C00C17B69E005C90A2 /* JSNamedNodeMap.cpp in Sources */, … … 25108 25089 BCEF45F50E687B5C001C1287 /* JSTextMetrics.cpp in Sources */, 25109 25090 E446141A0CD6826900FADA75 /* JSTimeRanges.cpp in Sources */, 25110 B12D236513560330002A28D4 /* JSTrackList.cpp in Sources */,25111 25091 1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */, 25112 25092 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */, … … 25268 25248 85031B470A44EFC700F992E0 /* MouseRelatedEvent.cpp in Sources */, 25269 25249 93309DFB099E64920056E581 /* MoveSelectionCommand.cpp in Sources */, 25270 B12D234113560282002A28D4 /* MultipleTrackList.cpp in Sources */,25271 25250 B1AD4E6213A12A0B00846B27 /* MutableTextTrack.cpp in Sources */, 25272 25251 85031B490A44EFC700F992E0 /* MutationEvent.cpp in Sources */, … … 25872 25851 93309EA4099EB78C0056E581 /* Timer.cpp in Sources */, 25873 25852 E44613AF0CD6331000FADA75 /* TimeRanges.cpp in Sources */, 25874 B12D234413560282002A28D4 /* TrackList.cpp in Sources */,25875 25853 49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */, 25876 25854 494BC40D12AEDD9E00743BD2 /* TransformationMatrixCA.cpp in Sources */, … … 26024 26002 24D912B713CA9A6900D21915 /* SVGAltGlyphItemElement.cpp in Sources */, 26025 26003 24D912BD13CA9A9700D21915 /* SVGGlyphRefElement.cpp in Sources */, 26004 49C9F32413D574F90052600A /* MediaStreamTrackList.cpp in Sources */, 26005 49C9F32713D574F90052600A /* MediaStreamTrack.cpp in Sources */, 26006 49C9F48E13D57D320052600A /* JSMediaStreamTrack.cpp in Sources */, 26007 49C9F49013D57D320052600A /* JSMediaStreamTrackList.cpp in Sources */, 26026 26008 ); 26027 26009 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/js/JSEventTarget.cpp
r89567 r91364 106 106 #endif 107 107 108 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)109 #include "ExclusiveTrackList.h"110 #include "MultipleTrackList.h"111 #include "TrackList.h"112 #endif113 114 108 using namespace JSC; 115 109 … … 209 203 #endif 210 204 211 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)212 if (MultipleTrackList* multipleTrackList = target->toMultipleTrackList())213 return toJS(exec, globalObject, multipleTrackList);214 215 if (ExclusiveTrackList* exclusiveTrackList = target->toExclusiveTrackList())216 return toJS(exec, globalObject, exclusiveTrackList);217 218 if (TrackList* trackList = target->toTrackList())219 return toJS(exec, globalObject, trackList);220 #endif221 222 205 ASSERT_NOT_REACHED(); 223 206 return jsNull(); -
trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp
r90949 r91364 48 48 #include "V8EventListenerList.h" 49 49 #include "V8EventSource.h" 50 #include "V8ExclusiveTrackList.h"51 50 #include "V8FileReader.h" 52 51 #include "V8FileWriter.h" … … 62 61 #include "V8MediaStream.h" 63 62 #include "V8MessageChannel.h" 64 #include "V8MultipleTrackList.h"65 63 #include "V8NamedNodeMap.h" 66 64 #include "V8Node.h" … … 72 70 #include "V8SharedWorkerContext.h" 73 71 #include "V8StyleSheet.h" 74 #include "V8TrackList.h"75 72 #include "V8WebSocket.h" 76 73 #include "V8Worker.h" … … 460 457 #endif 461 458 462 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)463 if (MultipleTrackList* multipleTrackList = target->toMultipleTrackList())464 return toV8(multipleTrackList);465 466 if (ExclusiveTrackList* exclusiveTrackList = target->toExclusiveTrackList())467 return toV8(exclusiveTrackList);468 469 if (TrackList* trackList = target->toTrackList())470 return toV8(trackList);471 #endif472 473 459 ASSERT(0); 474 460 return notHandledByInterceptor(); -
trunk/Source/WebCore/dom/DOMAllInOne.cpp
r91056 r91364 77 77 #include "ExceptionCode.cpp" 78 78 #include "ExceptionCodePlaceholder.cpp" 79 #include "ExclusiveTrackList.cpp"80 79 #include "IconURL.cpp" 81 80 #include "KeyboardEvent.cpp" 82 81 #include "LocalMediaStream.cpp" 83 82 #include "MediaStream.cpp" 83 #include "MediaStreamTrack.cpp" 84 #include "MediaStreamTrackList.cpp" 84 85 #include "MessageChannel.cpp" 85 86 #include "MessageEvent.cpp" … … 88 89 #include "MouseEvent.cpp" 89 90 #include "MouseRelatedEvent.cpp" 90 #include "MultipleTrackList.cpp"91 91 #include "MutationEvent.cpp" 92 92 #include "NameNodeList.cpp" … … 130 130 #include "TouchEvent.cpp" 131 131 #include "TouchList.cpp" 132 #include "TrackList.cpp"133 132 #include "TransformSourceLibxslt.cpp" 134 133 #include "Traversal.cpp" -
trunk/Source/WebCore/dom/EventTarget.cpp
r90972 r91364 218 218 #endif 219 219 220 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)221 TrackList* EventTarget::toTrackList()222 {223 return 0;224 }225 226 MultipleTrackList* EventTarget::toMultipleTrackList()227 {228 return 0;229 }230 231 ExclusiveTrackList* EventTarget::toExclusiveTrackList()232 {233 return 0;234 }235 #endif236 237 220 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture) 238 221 { -
trunk/Source/WebCore/dom/EventTarget.h
r89567 r91364 48 48 class EventListener; 49 49 class EventSource; 50 class ExclusiveTrackList;51 50 class FileReader; 52 51 class FileWriter; … … 59 58 class MediaStream; 60 59 class MessagePort; 61 class MultipleTrackList;62 60 class Node; 63 61 class Notification; … … 66 64 class SharedWorker; 67 65 class SharedWorkerContext; 68 class TrackList;69 66 class WebSocket; 70 67 class Worker; … … 158 155 #endif 159 156 160 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)161 virtual TrackList* toTrackList();162 virtual MultipleTrackList* toMultipleTrackList();163 virtual ExclusiveTrackList* toExclusiveTrackList();164 #endif165 166 157 virtual ScriptExecutionContext* scriptExecutionContext() const = 0; 167 158 -
trunk/Source/WebCore/dom/LocalMediaStream.cpp
r89567 r91364 30 30 #include "Event.h" 31 31 #include "EventNames.h" 32 #include "ExclusiveTrackList.h"33 32 #include "MediaStreamFrameController.h" 34 #include "MultipleTrackList.h"35 33 #include "ScriptExecutionContext.h" 36 34 … … 60 58 }; 61 59 62 PassRefPtr<LocalMediaStream> LocalMediaStream::create(MediaStreamFrameController* frameController, const String& label, PassRefPtr<M ultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks)60 PassRefPtr<LocalMediaStream> LocalMediaStream::create(MediaStreamFrameController* frameController, const String& label, PassRefPtr<MediaStreamTrackList> tracks) 63 61 { 64 return adoptRef(new LocalMediaStream(frameController, label, audioTracks, videoTracks));62 return adoptRef(new LocalMediaStream(frameController, label, tracks)); 65 63 } 66 64 67 LocalMediaStream::LocalMediaStream(MediaStreamFrameController* frameController, const String& label, PassRefPtr<MultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks) 68 : MediaStream(frameController, label, true) 69 , m_audioTracks(audioTracks) 70 , m_videoTracks(videoTracks) 65 LocalMediaStream::LocalMediaStream(MediaStreamFrameController* frameController, const String& label, PassRefPtr<MediaStreamTrackList> tracks) 66 : MediaStream(frameController, label, tracks, true) 71 67 { 72 ASSERT(m_audioTracks);73 ASSERT(m_videoTracks);74 m_audioTracks->associateStream(label);75 m_videoTracks->associateStream(label);76 68 } 77 69 … … 95 87 void LocalMediaStream::streamEnded() 96 88 { 97 m_audioTracks->clear();98 m_videoTracks->clear();99 100 89 MediaStream::streamEnded(); 101 }102 103 PassRefPtr<MultipleTrackList> LocalMediaStream::audioTracks() const104 {105 return m_audioTracks;106 }107 108 PassRefPtr<ExclusiveTrackList> LocalMediaStream::videoTracks() const109 {110 return m_videoTracks;111 90 } 112 91 … … 117 96 118 97 mediaStreamFrameController()->stopGeneratedStream(label()); 119 m_audioTracks->clear();120 m_videoTracks->clear();121 98 122 99 m_readyState = ENDED; -
trunk/Source/WebCore/dom/LocalMediaStream.h
r89567 r91364 33 33 namespace WebCore { 34 34 35 class ExclusiveTrackList;36 class MultipleTrackList;37 38 35 class LocalMediaStream : public MediaStream { 39 36 public: 40 static PassRefPtr<LocalMediaStream> create(MediaStreamFrameController*, const String& label, PassRefPtr<M ultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks);37 static PassRefPtr<LocalMediaStream> create(MediaStreamFrameController*, const String& label, PassRefPtr<MediaStreamTrackList> tracks); 41 38 virtual ~LocalMediaStream(); 42 39 43 40 void stop(); 44 45 PassRefPtr<MultipleTrackList> audioTracks() const;46 PassRefPtr<ExclusiveTrackList> videoTracks() const;47 41 48 42 // MediaStreamFrameController::StreamClient implementation. … … 53 47 virtual LocalMediaStream* toLocalMediaStream(); 54 48 49 protected: 50 virtual bool isLocalMediaStream() const { return true; } 51 55 52 private: 56 LocalMediaStream(MediaStreamFrameController*, const String& label, PassRefPtr<M ultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks);53 LocalMediaStream(MediaStreamFrameController*, const String& label, PassRefPtr<MediaStreamTrackList> tracks); 57 54 class DispatchUpdateTask; 58 55 friend class DispatchUpdateTask; 59 56 60 57 void onStop(); 61 62 RefPtr<MultipleTrackList> m_audioTracks;63 RefPtr<ExclusiveTrackList> m_videoTracks;64 58 }; 65 59 -
trunk/Source/WebCore/dom/LocalMediaStream.idl
r89567 r91364 24 24 25 25 module core { 26 26 27 interface [ 27 28 Conditional=MEDIA_STREAM, … … 30 31 ] LocalMediaStream : MediaStream { 31 32 void stop(); 32 33 // Track control.34 readonly attribute MultipleTrackList audioTracks;35 readonly attribute ExclusiveTrackList videoTracks;36 33 }; 37 34 -
trunk/Source/WebCore/dom/MediaStream.cpp
r89567 r91364 33 33 namespace WebCore { 34 34 35 PassRefPtr<MediaStream> MediaStream::create(MediaStreamFrameController* frameController, const String& label )35 PassRefPtr<MediaStream> MediaStream::create(MediaStreamFrameController* frameController, const String& label, PassRefPtr<MediaStreamTrackList> tracks, bool isLocalMediaStream) 36 36 { 37 return adoptRef(new MediaStream(frameController, label ));37 return adoptRef(new MediaStream(frameController, label, tracks, isLocalMediaStream)); 38 38 } 39 39 40 MediaStream::MediaStream(MediaStreamFrameController* frameController, const String& label, bool isLocalMediaStream)40 MediaStream::MediaStream(MediaStreamFrameController* frameController, const String& label, PassRefPtr<MediaStreamTrackList> tracks, bool isLocalMediaStream) 41 41 : MediaStreamClient(frameController, label, isLocalMediaStream) 42 42 , m_readyState(LIVE) 43 , m_tracks(tracks) 43 44 { 44 45 } -
trunk/Source/WebCore/dom/MediaStream.h
r89567 r91364 31 31 #include "EventTarget.h" 32 32 #include "MediaStreamFrameController.h" 33 #include "MediaStreamTrackList.h" 33 34 #include "ScriptExecutionContext.h" 34 35 #include <wtf/Forward.h> … … 48 49 }; 49 50 50 static PassRefPtr<MediaStream> create(MediaStreamFrameController*, const String& label );51 static PassRefPtr<MediaStream> create(MediaStreamFrameController*, const String& label, PassRefPtr<MediaStreamTrackList> tracks, bool isLocalMediaStream = false); 51 52 virtual ~MediaStream(); 52 53 // FIXME: implement the record method when MediaStreamRecorder is available.54 53 55 54 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended); … … 57 56 unsigned short readyState() const { return m_readyState; } 58 57 const String& label() const { return clientId(); } 58 59 PassRefPtr<MediaStreamTrackList> tracks() { return m_tracks; } 59 60 60 61 // MediaStreamFrameController::MediaStreamClient implementation. … … 69 70 70 71 protected: 71 MediaStream(MediaStreamFrameController*, const String& label, bool isLocalMediaStream = false);72 MediaStream(MediaStreamFrameController*, const String& label, PassRefPtr<MediaStreamTrackList> tracks, bool isLocalMediaStream); 72 73 73 74 // EventTarget implementation. … … 85 86 86 87 EventTargetData m_eventTargetData; 88 89 RefPtr<MediaStreamTrackList> m_tracks; 87 90 }; 88 91 -
trunk/Source/WebCore/dom/MediaStream.idl
r89781 r91364 24 24 25 25 module core { 26 26 27 interface [ 27 28 LegacyDefaultOptionalArguments, … … 30 31 ] MediaStream { 31 32 readonly attribute DOMString label; 33 readonly attribute MediaStreamTrackList tracks; 34 32 35 // FIXME: implement the record method when MediaStreamRecorder is available. 33 36 -
trunk/Source/WebCore/dom/MediaStreamTrack.cpp
r91363 r91364 23 23 */ 24 24 25 #i fndef ExclusiveTrackList_h26 # define ExclusiveTrackList_h25 #include "config.h" 26 #include "MediaStreamTrack.h" 27 27 28 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK) 29 30 #include "TrackList.h" 31 #include <wtf/Vector.h> 28 #if ENABLE(MEDIA_STREAM) 32 29 33 30 namespace WebCore { 34 31 35 class ExclusiveTrackList : public TrackList { 36 public: 37 static const long NoSelection = -1; 32 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(const String& id, const String& kind, const String& label) 33 { 34 return adoptRef(new MediaStreamTrack(id, kind, label)); 35 } 38 36 39 static PassRefPtr<ExclusiveTrackList> create(const TrackVector&, long selectedIndex = NoSelection); 40 virtual ~ExclusiveTrackList(); 37 MediaStreamTrack::MediaStreamTrack(const String& id, const String& kind, const String& label) 38 : m_id(id) 39 , m_kind(kind) 40 , m_label(label) 41 , m_enabled(true) 42 { 43 } 41 44 42 int selectedIndex() const { return m_selectedIndex; } 43 void select(long index, ExceptionCode&); 45 MediaStreamTrack::~MediaStreamTrack() 46 { 47 } 44 48 45 virtual void clear(); 49 const String& MediaStreamTrack::kind() const 50 { 51 return m_kind; 52 } 46 53 47 #if ENABLE(MEDIA_STREAM) 48 virtual void trackFailed(unsigned long index); 49 #endif 54 const String& MediaStreamTrack::label() const 55 { 56 return m_label; 57 } 50 58 51 // EventTarget implementation. 52 virtual ExclusiveTrackList* toExclusiveTrackList(); 59 bool MediaStreamTrack::enabled() const 60 { 61 return m_enabled; 62 } 53 63 54 private: 55 ExclusiveTrackList(const TrackVector&, long selectedIndex); 64 void MediaStreamTrack::setEnabled(bool enabled) 65 { 66 m_enabled = enabled; 56 67 57 long m_selectedIndex; 58 }; 68 if (mediaStreamFrameController()) 69 mediaStreamFrameController()->setMediaStreamTrackEnabled(m_id, enabled); 70 } 59 71 60 72 } // namespace WebCore 61 73 62 #endif // ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK) 63 64 #endif // ExclusiveTrackList_h 74 #endif // ENABLE(MEDIA_STREAM) -
trunk/Source/WebCore/dom/MediaStreamTrack.h
r91363 r91364 23 23 */ 24 24 25 #ifndef M ultipleTrackList_h26 #define M ultipleTrackList_h25 #ifndef MediaStreamTrack_h 26 #define MediaStreamTrack_h 27 27 28 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)28 #if ENABLE(MEDIA_STREAM) 29 29 30 #include "TrackList.h" 30 #include "PlatformString.h" 31 #include "MediaStreamFrameController.h" 32 #include <wtf/PassRefPtr.h> 33 #include <wtf/RefCounted.h> 31 34 #include <wtf/Vector.h> 32 35 33 36 namespace WebCore { 34 37 35 typedef Vector<bool> EnabledTracks; 38 class MediaStreamTrack : public RefCounted<MediaStreamTrack>, 39 public MediaStreamFrameController::GenericClient { 40 public: 41 static PassRefPtr<MediaStreamTrack> create(const String& id, const String& kind, const String& label); 42 virtual ~MediaStreamTrack(); 36 43 37 class MultipleTrackList : public TrackList { 38 public: 39 static PassRefPtr<MultipleTrackList> create(const TrackVector&, const EnabledTracks&); 40 virtual ~MultipleTrackList(); 44 const String& kind() const; 45 const String& label() const; 41 46 42 bool isEnabled(unsigned long index, ExceptionCode&) const; 43 void enable(unsigned long index, ExceptionCode&); 44 void disable(unsigned long index, ExceptionCode&); 45 46 virtual void clear(); 47 48 #if ENABLE(MEDIA_STREAM) 49 virtual void trackFailed(unsigned long index); 50 #endif 51 52 // EventTarget implementation. 53 virtual MultipleTrackList* toMultipleTrackList(); 47 bool enabled() const; 48 void setEnabled(bool enabled); 54 49 55 50 private: 56 M ultipleTrackList(const TrackVector&, const EnabledTracks&);51 MediaStreamTrack(const String& id, const String& kind, const String& label); 57 52 58 Vector<bool> m_isEnabled; 53 String m_id; 54 String m_kind; 55 String m_label; 56 bool m_enabled; 59 57 }; 58 59 typedef Vector<RefPtr<MediaStreamTrack> > TrackVector; 60 60 61 61 } // namespace WebCore 62 62 63 #endif // ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)63 #endif // ENABLE(MEDIA_STREAM) 64 64 65 #endif // M ultipleTrackList_h65 #endif // MediaStreamTrack_h -
trunk/Source/WebCore/dom/MediaStreamTrack.idl
r91363 r91364 26 26 27 27 interface [ 28 Conditional=MEDIA_STREAM|VIDEO_TRACK, 29 LegacyDefaultOptionalArguments, 30 GenerateNativeConverter, 31 ] ExclusiveTrackList : TrackList { 32 // FIXME: the spec says unsigned long, but -1 is used when nothing is selected. 33 // A bug has been already submitted to the spec draft. 34 // http://www.w3.org/Bugs/Public/show_bug.cgi?id=12600 35 readonly attribute long selectedIndex; 36 void select(in long index) 37 raises(DOMException); 28 Conditional=MEDIA_STREAM, 29 ] MediaStreamTrack { 30 readonly attribute DOMString kind; 31 readonly attribute DOMString label; 32 attribute boolean enabled; 38 33 }; 39 34 -
trunk/Source/WebCore/dom/MediaStreamTrackList.cpp
r91363 r91364 23 23 */ 24 24 25 module core { 25 #include "config.h" 26 #include "MediaStreamTrackList.h" 26 27 27 interface [ 28 LegacyDefaultOptionalArguments, 29 Conditional=MEDIA_STREAM|VIDEO_TRACK, 30 EventTarget 31 ] TrackList { 32 readonly attribute unsigned long length; 33 DOMString getID(in unsigned long index) 34 raises(DOMException); 35 DOMString getKind(in unsigned long index) 36 raises(DOMException); 37 DOMString getLabel(in unsigned long index) 38 raises(DOMException); 39 DOMString getLanguage(in unsigned long index) 40 raises(DOMException); 28 #if ENABLE(MEDIA_STREAM) 41 29 42 attribute EventListener onchange; 43 }; 30 namespace WebCore { 44 31 32 PassRefPtr<MediaStreamTrackList> MediaStreamTrackList::create(const TrackVector& tracks) 33 { 34 return adoptRef(new MediaStreamTrackList(tracks)); 45 35 } 36 37 MediaStreamTrackList::MediaStreamTrackList(const TrackVector& tracks) 38 : m_tracks(tracks) 39 { 40 } 41 42 MediaStreamTrackList::~MediaStreamTrackList() 43 { 44 } 45 46 unsigned MediaStreamTrackList::length() const 47 { 48 return m_tracks.size(); 49 } 50 51 PassRefPtr<MediaStreamTrack> MediaStreamTrackList::item(unsigned index) const 52 { 53 if (index < m_tracks.size()) 54 return m_tracks.at(index); 55 else 56 return PassRefPtr<MediaStreamTrack>(); 57 } 58 59 } // namespace WebCore 60 61 #endif // ENABLE(MEDIA_STREAM) -
trunk/Source/WebCore/dom/MediaStreamTrackList.h
r91363 r91364 23 23 */ 24 24 25 #ifndef ExclusiveTrackList_h26 #define ExclusiveTrackList_h25 #ifndef MediaStreamTrackList_h 26 #define MediaStreamTrackList_h 27 27 28 #if ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)28 #if ENABLE(MEDIA_STREAM) 29 29 30 #include "TrackList.h" 31 #include <wtf/Vector.h> 30 #include "MediaStreamTrack.h" 31 #include <wtf/PassRefPtr.h> 32 #include <wtf/RefCounted.h> 33 #include <wtf/RefPtr.h> 32 34 33 35 namespace WebCore { 34 36 35 class ExclusiveTrackList : public TrackList{37 class MediaStreamTrackList : public RefCounted<MediaStreamTrackList> { 36 38 public: 37 static const long NoSelection = -1; 39 static PassRefPtr<MediaStreamTrackList> create(const TrackVector& m_tracks); 40 virtual ~MediaStreamTrackList(); 38 41 39 static PassRefPtr<ExclusiveTrackList> create(const TrackVector&, long selectedIndex = NoSelection); 40 virtual ~ExclusiveTrackList(); 42 // DOM methods & attributes for MediaStreamTrackList 43 unsigned length() const; 44 PassRefPtr<MediaStreamTrack> item(unsigned index) const; 41 45 42 int selectedIndex() const { return m_selectedIndex; } 43 void select(long index, ExceptionCode&); 44 45 virtual void clear(); 46 47 #if ENABLE(MEDIA_STREAM) 48 virtual void trackFailed(unsigned long index); 49 #endif 50 51 // EventTarget implementation. 52 virtual ExclusiveTrackList* toExclusiveTrackList(); 46 void associateStream(const String& label) { m_associatedStreamLabel = label; } 53 47 54 48 private: 55 ExclusiveTrackList(const TrackVector&, long selectedIndex);49 MediaStreamTrackList(const TrackVector& m_tracks); 56 50 57 long m_selectedIndex; 51 TrackVector m_tracks; 52 String m_associatedStreamLabel; 58 53 }; 59 54 60 55 } // namespace WebCore 61 56 62 #endif // ENABLE(MEDIA_STREAM) || ENABLE(VIDEO_TRACK)57 #endif // ENABLE(MEDIA_STREAM) 63 58 64 #endif // ExclusiveTrackList_h59 #endif // MediaStreamTrackList_h -
trunk/Source/WebCore/dom/MediaStreamTrackList.idl
r91363 r91364 26 26 27 27 interface [ 28 Conditional=MEDIA_STREAM|VIDEO_TRACK,29 28 LegacyDefaultOptionalArguments, 30 GenerateNativeConverter, 31 ] MultipleTrackList : TrackList { 32 boolean isEnabled(in unsigned long index) 33 raises(DOMException); 34 void enable(in unsigned long index) 35 raises(DOMException); 36 void disable(in unsigned long index) 37 raises(DOMException); 29 Conditional=MEDIA_STREAM, 30 HasIndexGetter 31 ] MediaStreamTrackList { 32 MediaStreamTrack item(in [IsIndex] unsigned long index); 33 34 readonly attribute unsigned long length; 38 35 }; 39 36 -
trunk/Source/WebCore/page/MediaStreamClient.h
r88341 r91364 53 53 virtual void stopGeneratedStream(const String& streamLabel) = 0; 54 54 55 // Enable/disable an audio track in a generated stream. 56 virtual void enableAudioTrack(const String& streamLabel, unsigned long index) = 0; 57 virtual void disableAudioTrack(const String& streamLabel, unsigned long index) = 0; 58 59 // Select a video track in a generated stream. 60 virtual void selectVideoTrack(const String& streamLabel, long index) = 0; 55 // Enable/disable an track. 56 virtual void setMediaStreamTrackEnabled(const String& trackId, bool enabled) = 0; 61 57 62 58 protected: -
trunk/Source/WebCore/page/MediaStreamController.cpp
r88341 r91364 28 28 #if ENABLE(MEDIA_STREAM) 29 29 30 #include "ExclusiveTrackList.h"31 30 #include "MediaStreamFrameController.h" 32 #include "M ultipleTrackList.h"31 #include "MediaStreamTrackList.h" 33 32 #include "SecurityOrigin.h" 34 33 #include <wtf/Vector.h> … … 120 119 } 121 120 122 void MediaStreamController:: enableAudioTrack(const String& streamLabel, unsigned long index)121 void MediaStreamController::setMediaStreamTrackEnabled(const String& trackId, bool enabled) 123 122 { 124 m_client-> enableAudioTrack(streamLabel, index);123 m_client->setMediaStreamTrackEnabled(trackId, enabled); 125 124 } 126 125 127 void MediaStreamController::disableAudioTrack(const String& streamLabel, unsigned long index) 128 { 129 m_client->disableAudioTrack(streamLabel, index); 130 } 131 132 void MediaStreamController::selectVideoTrack(const String& streamLabel, long index) 133 { 134 m_client->selectVideoTrack(streamLabel, index); 135 } 136 137 void MediaStreamController::streamGenerated(int controllerRequestId, const String& streamLabel, PassRefPtr<MultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks) 126 void MediaStreamController::streamGenerated(int controllerRequestId, const String& streamLabel, PassRefPtr<MediaStreamTrackList> tracks) 138 127 { 139 128 // Don't assert since the frame controller can have been destroyed while the request reply was coming back. … … 143 132 m_requests.remove(controllerRequestId); 144 133 ASSERT(request.frameController()); 145 request.frameController()->streamGenerated(request.localId(), streamLabel, audioTracks, videoTracks);134 request.frameController()->streamGenerated(request.localId(), streamLabel, tracks); 146 135 } 147 136 } … … 164 153 } 165 154 166 void MediaStreamController::audioTrackFailed(const String& streamLabel, unsigned long index)167 {168 // Don't assert since the frame controller can have been destroyed by the time this is called.169 if (m_streams.contains(streamLabel))170 m_streams.get(streamLabel)->audioTrackFailed(streamLabel, index);171 }172 173 void MediaStreamController::videoTrackFailed(const String& streamLabel, unsigned long index)174 {175 // Don't assert since the frame controller can have been destroyed by the time this is called.176 if (m_streams.contains(streamLabel))177 m_streams.get(streamLabel)->videoTrackFailed(streamLabel, index);178 }179 180 155 } // namespace WebCore 181 156 -
trunk/Source/WebCore/page/MediaStreamController.h
r88341 r91364 37 37 namespace WebCore { 38 38 39 class ExclusiveTrackList;40 39 class MediaStreamClient; 41 40 class MediaStreamFrameController; 42 class M ultipleTrackList;41 class MediaStreamTrackList; 43 42 class SecurityOrigin; 44 43 … … 54 53 void generateStream(MediaStreamFrameController*, int requestId, GenerateStreamOptionFlags, PassRefPtr<SecurityOrigin>); 55 54 void stopGeneratedStream(const String& streamLabel); 56 void enableAudioTrack(const String& streamLabel, unsigned long index);57 void disableAudioTrack(const String& streamLabel, unsigned long index);58 void selectVideoTrack(const String& streamLabel, long index);59 55 60 void streamGenerated(int requestId, const String& streamLabel, PassRefPtr<MultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks); 56 // Enable/disable an track. 57 void setMediaStreamTrackEnabled(const String& trackId, bool enabled); 58 59 void streamGenerated(int requestId, const String& streamLabel, PassRefPtr<MediaStreamTrackList> tracks); 61 60 void streamGenerationFailed(int requestId, NavigatorUserMediaError::ErrorCode); 62 61 void streamFailed(const String& streamLabel); 63 void audioTrackFailed(const String& streamLabel, unsigned long index);64 void videoTrackFailed(const String& streamLabel, unsigned long index);65 62 66 63 private: -
trunk/Source/WebCore/page/MediaStreamFrameController.cpp
r89567 r91364 30 30 #include "DOMWindow.h" 31 31 #include "Document.h" 32 #include "ExclusiveTrackList.h"33 32 #include "Frame.h" 34 33 #include "LocalMediaStream.h" 35 34 #include "MediaStreamController.h" 36 #include "M ultipleTrackList.h"35 #include "MediaStreamTrackList.h" 37 36 #include "NavigatorUserMediaErrorCallback.h" 38 37 #include "NavigatorUserMediaSuccessCallback.h" … … 308 307 } 309 308 310 void MediaStreamFrameController::enableAudioTrack(const String& streamLabel, unsigned long index) 311 { 312 // Don't assert since the audio tracks don't necessarily keep alive their associated generated stream object. 313 if (!m_streams.contains(streamLabel)) 314 return; 315 309 void MediaStreamFrameController::setMediaStreamTrackEnabled(const String& trackId, bool enabled) 310 { 316 311 if (isClientAvailable()) 317 pageController()->enableAudioTrack(streamLabel, index); 318 } 319 320 void MediaStreamFrameController::disableAudioTrack(const String& streamLabel, unsigned long index) 321 { 322 // Don't assert since the audio tracks don't necessarily keep alive their associated generated stream object. 323 if (!m_streams.contains(streamLabel)) 324 return; 325 326 if (isClientAvailable()) 327 pageController()->disableAudioTrack(streamLabel, index); 328 } 329 330 void MediaStreamFrameController::selectVideoTrack(const String& streamLabel, long index) 331 { 332 // Don't assert since the audio tracks don't necessarily keep alive their associated generated stream object. 333 if (!m_streams.contains(streamLabel)) 334 return; 335 336 if (isClientAvailable()) 337 pageController()->selectVideoTrack(streamLabel, index); 338 } 339 340 void MediaStreamFrameController::streamGenerated(int requestId, const String& label, PassRefPtr<MultipleTrackList> audioTracksParam, PassRefPtr<ExclusiveTrackList> videoTracksParam) 312 pageController()->setMediaStreamTrackEnabled(trackId, enabled); 313 } 314 315 void MediaStreamFrameController::streamGenerated(int requestId, const String& label, PassRefPtr<MediaStreamTrackList> tracksParam) 341 316 { 342 317 // Don't assert since the request can have been aborted as a result of embedder detachment. … … 346 321 ASSERT(m_requests.get(requestId)->isGenerateStreamRequest()); 347 322 ASSERT(!label.isNull()); 348 ASSERT(audioTracksParam); 349 ASSERT(videoTracksParam); 350 351 RefPtr<MultipleTrackList> audioTracks = audioTracksParam; 352 RefPtr<ExclusiveTrackList> videoTracks = videoTracksParam; 353 354 int audioTracksClientId = m_clients.getNextId(); 355 audioTracks->associateFrameController(this, audioTracksClientId); 356 m_clients.add(audioTracksClientId, audioTracks.get()); 357 358 int videoTracksClientId = m_clients.getNextId(); 359 videoTracks->associateFrameController(this, videoTracksClientId); 360 m_clients.add(videoTracksClientId, videoTracks.get()); 323 ASSERT(tracksParam); 324 325 RefPtr<MediaStreamTrackList> tracks = tracksParam; 326 327 for (unsigned i = 0; i < tracks->length(); ++i) { 328 int trackClientId = m_clients.getNextId(); 329 RefPtr<MediaStreamTrack> track = tracks->item(i); 330 track->associateFrameController(this, trackClientId); 331 m_clients.add(trackClientId, track.get()); 332 } 361 333 362 334 RefPtr<GenerateStreamRequest> streamRequest = static_cast<GenerateStreamRequest*>(m_requests.get(requestId).get()); 363 RefPtr<LocalMediaStream> generatedStream = LocalMediaStream::create(this, label, audioTracks.release(), videoTracks.release());335 RefPtr<LocalMediaStream> generatedStream = LocalMediaStream::create(this, label, tracks.release()); 364 336 m_streams.add(label, generatedStream.get()); 365 337 m_requests.remove(requestId); … … 389 361 } 390 362 391 void MediaStreamFrameController::audioTrackFailed(const String& label, unsigned long index)392 {393 MediaStream* stream = getStreamFromLabel(label);394 ASSERT(stream->isLocalMediaStream());395 static_cast<LocalMediaStream*>(stream)->audioTracks()->trackFailed(index);396 }397 398 void MediaStreamFrameController::videoTrackFailed(const String& label, unsigned long index)399 {400 MediaStream* stream = getStreamFromLabel(label);401 ASSERT(stream->isLocalMediaStream());402 static_cast<LocalMediaStream*>(stream)->videoTracks()->trackFailed(index);403 }404 405 363 } // namespace WebCore 406 364 -
trunk/Source/WebCore/page/MediaStreamFrameController.h
r89567 r91364 38 38 namespace WebCore { 39 39 40 class ExclusiveTrackList;41 40 class Frame; 42 41 class LocalMediaStream; 43 42 class MediaStream; 44 43 class MediaStreamController; 45 class M ultipleTrackList;44 class MediaStreamTrackList; 46 45 class NavigatorUserMediaErrorCallback; 47 46 class NavigatorUserMediaSuccessCallback; … … 77 76 78 77 protected: 79 // Used for objects that are optionally associated to the frame controller after construction, like the track lists.78 // Used for objects that are optionally associated to the frame controller after construction, like the MediaStreamTracks. 80 79 void associateFrameController(MediaStreamFrameController* frameController, const IdType& id) 81 80 { … … 156 155 void generateStream(const String& options, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>, ExceptionCode&); 157 156 158 // Stop a generatedstream.157 // Stop a local media stream. 159 158 void stopGeneratedStream(const String& streamLabel); 160 159 161 // Enable/disable an audio track in a generated stream. 162 void enableAudioTrack(const String& streamLabel, unsigned long index); 163 void disableAudioTrack(const String& streamLabel, unsigned long index); 164 165 // Select a video track in a generated stream. 166 void selectVideoTrack(const String& streamLabel, long index); 160 // Enable/disable an track. 161 void setMediaStreamTrackEnabled(const String& trackId, bool enabled); 167 162 168 163 // --- Calls coming back from the controller. --- // 169 164 170 165 // Report the generation of a new local stream. 171 void streamGenerated(int requestId, const String& streamLabel, PassRefPtr<M ultipleTrackList> audioTracks, PassRefPtr<ExclusiveTrackList> videoTracks);166 void streamGenerated(int requestId, const String& streamLabel, PassRefPtr<MediaStreamTrackList> tracks); 172 167 173 168 // Report a failure in the generation of a new stream. … … 176 171 // Report the end of a stream for external reasons. 177 172 void streamFailed(const String& streamLabel); 178 179 // Report the unexpected unavailability of a live media track.180 void audioTrackFailed(const String& streamLabel, unsigned long index);181 void videoTrackFailed(const String& streamLabel, unsigned long index);182 173 183 174 private:
Note: See TracChangeset
for help on using the changeset viewer.
