Changeset 92365 in webkit
- Timestamp:
- Aug 4, 2011 3:07:10 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 16 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r92304 r92365 2012 2012 dom/MediaStreamTrack.cpp 2013 2013 dom/MediaStreamTrackList.cpp 2014 dom/StreamEvent.cpp2014 p2p/MediaStreamEvent.cpp 2015 2015 p2p/PeerConnection.cpp 2016 2016 page/MediaStreamController.cpp … … 2024 2024 dom/MediaStreamTrack.idl 2025 2025 dom/MediaStreamTrackList.idl 2026 dom/StreamEvent.idl2026 p2p/MediaStreamEvent.idl 2027 2027 p2p/PeerConnection.idl 2028 2028 p2p/SignalingCallback.idl -
trunk/Source/WebCore/ChangeLog
r92364 r92365 1 2011-08-04 Tommy Widenflycht <tommyw@google.com> 2 3 MediaStream API: Rename StreamEvent to MediaStreamEvent 4 https://bugs.webkit.org/show_bug.cgi?id=65669 5 6 Reviewed by Tony Gentilcore. 7 8 * CMakeLists.txt: 9 * CodeGenerators.pri: 10 * DerivedSources.cpp: 11 * DerivedSources.make: 12 * GNUmakefile.list.am: 13 * WebCore.gypi: 14 * WebCore.pro: 15 * WebCore.vcproj/WebCore.vcproj: 16 * WebCore.xcodeproj/project.pbxproj: 17 * bindings/js/JSEventCustom.cpp: 18 (WebCore::toJS): 19 * bindings/v8/custom/V8EventCustom.cpp: 20 (WebCore::toV8): 21 * dom/DOMAllInOne.cpp: 22 * dom/Event.cpp: 23 (WebCore::Event::isMediaStreamEvent): 24 * dom/Event.h: 25 * p2p/MediaStreamEvent.cpp: Renamed from Source/WebCore/dom/StreamEvent.cpp. 26 (WebCore::MediaStreamEvent::create): 27 (WebCore::MediaStreamEvent::MediaStreamEvent): 28 (WebCore::MediaStreamEvent::~MediaStreamEvent): 29 (WebCore::MediaStreamEvent::initMediaStreamEvent): 30 (WebCore::MediaStreamEvent::stream): 31 * p2p/MediaStreamEvent.h: Renamed from Source/WebCore/dom/StreamEvent.h. 32 (WebCore::MediaStreamEvent::isMediaStreamEvent): 33 * p2p/MediaStreamEvent.idl: Renamed from Source/WebCore/dom/StreamEvent.idl. 34 * p2p/PeerConnection.cpp: 35 (WebCore::PeerConnection::dispatchStreamEvent): 36 1 37 2011-08-02 Hans Wennborg <hans@chromium.org> 2 38 -
trunk/Source/WebCore/CodeGenerators.pri
r92304 r92365 165 165 dom/RangeException.idl \ 166 166 dom/Range.idl \ 167 dom/StreamEvent.idl \168 167 dom/StringCallback.idl \ 169 168 dom/Text.idl \ … … 328 327 notifications/Notification.idl \ 329 328 notifications/NotificationCenter.idl \ 329 p2p/MediaStreamEvent.idl \ 330 330 p2p/PeerConnection.idl \ 331 331 p2p/SignalingCallback.idl \ -
trunk/Source/WebCore/DerivedSources.cpp
r92304 r92365 232 232 #include "JSMediaList.cpp" 233 233 #include "JSMediaStream.cpp" 234 #include "JSMediaStreamEvent.cpp" 234 235 #include "JSMediaStreamList.cpp" 235 236 #include "JSMediaStreamTrack.cpp" … … 296 297 #include "JSStorageInfoQuotaCallback.cpp" 297 298 #include "JSStorageInfoUsageCallback.cpp" 298 #include "JSStreamEvent.cpp"299 299 #include "JSStringCallback.cpp" 300 300 #include "JSStyleMedia.cpp" -
trunk/Source/WebCore/DerivedSources.make
r92308 r92365 304 304 MediaQueryListListener \ 305 305 MediaStream \ 306 MediaStreamEvent \ 306 307 MediaStreamList \ 307 308 MediaStreamTrack \ … … 373 374 StorageInfoQuotaCallback \ 374 375 StorageInfoUsageCallback \ 375 StreamEvent \376 376 StringCallback \ 377 377 SVGAElement \ … … 889 889 $(WebCore)/html \ 890 890 $(WebCore)/css \ 891 $(WebCore)/p2p \ 891 892 $(WebCore)/page \ 892 893 $(WebCore)/notifications \ -
trunk/Source/WebCore/GNUmakefile.list.am
r92304 r92365 356 356 DerivedSources/WebCore/JSMediaStream.cpp \ 357 357 DerivedSources/WebCore/JSMediaStream.h \ 358 DerivedSources/WebCore/JSMediaStreamEvent.cpp \ 359 DerivedSources/WebCore/JSMediaStreamEvent.h \ 358 360 DerivedSources/WebCore/JSMediaStreamList.cpp \ 359 361 DerivedSources/WebCore/JSMediaStreamList.h \ … … 468 470 DerivedSources/WebCore/JSStorageInfoQuotaCallback.h \ 469 471 DerivedSources/WebCore/JSStorageInfoUsageCallback.h \ 470 DerivedSources/WebCore/JSStreamEvent.cpp \471 DerivedSources/WebCore/JSStreamEvent.h \472 472 DerivedSources/WebCore/JSStyleMedia.cpp \ 473 473 DerivedSources/WebCore/JSStyleMedia.h \ … … 1290 1290 Source/WebCore/dom/StaticNodeList.cpp \ 1291 1291 Source/WebCore/dom/StaticNodeList.h \ 1292 Source/WebCore/dom/StreamEvent.cpp \1293 Source/WebCore/dom/StreamEvent.h \1294 1292 Source/WebCore/dom/StyledElement.cpp \ 1295 1293 Source/WebCore/dom/StyledElement.h \ … … 2197 2195 Source/WebCore/notifications/Notification.h \ 2198 2196 Source/WebCore/notifications/NotificationPresenter.h \ 2197 Source/WebCore/p2p/MediaStreamEvent.cpp \ 2198 Source/WebCore/p2p/MediaStreamEvent.h \ 2199 2199 Source/WebCore/p2p/PeerConnection.cpp \ 2200 2200 Source/WebCore/p2p/PeerConnection.h \ -
trunk/Source/WebCore/WebCore.gypi
r92304 r92365 1193 1193 'dom/RangeException.idl', 1194 1194 'dom/RequestAnimationFrameCallback.idl', 1195 'dom/StreamEvent.idl',1196 1195 'dom/StringCallback.idl', 1197 1196 'dom/Text.idl', … … 1359 1358 'notifications/Notification.idl', 1360 1359 'notifications/NotificationCenter.idl', 1360 'p2p/MediaStreamEvent.idl', 1361 1361 'p2p/PeerConnection.idl', 1362 1362 'p2p/SignalingCallback.idl', … … 2852 2852 'notifications/NotificationCenter.h', 2853 2853 'notifications/NotificationContents.h', 2854 'p2p/MediaStreamEvent.cpp', 2855 'p2p/MediaStreamEvent.h', 2854 2856 'p2p/PeerConnection.cpp', 2855 2857 'p2p/PeerConnection.h', … … 5390 5392 'dom/StaticNodeList.cpp', 5391 5393 'dom/StaticNodeList.h', 5392 'dom/StreamEvent.cpp',5393 'dom/StreamEvent.h',5394 5394 'dom/StringCallback.cpp', 5395 5395 'dom/StringCallback.h', -
trunk/Source/WebCore/WebCore.pro
r92304 r92365 3245 3245 dom/MediaStreamTrack.h \ 3246 3246 dom/MediaStreamTrackList.h \ 3247 dom/StreamEvent.h \3247 p2p/MediaStreamEvent.h \ 3248 3248 p2p/PeerConnection.h \ 3249 3249 p2p/SignalingCallback.h \ … … 3262 3262 dom/MediaStreamTrack.cpp \ 3263 3263 dom/MediaStreamTrackList.cpp \ 3264 dom/StreamEvent.cpp \3264 p2p/MediaStreamEvent.cpp \ 3265 3265 p2p/PeerConnection.cpp \ 3266 3266 page/MediaStreamController.cpp \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r92304 r92365 10983 10983 </File> 10984 10984 <File 10985 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamEvent.cpp" 10986 > 10987 <FileConfiguration 10988 Name="Debug|Win32" 10989 ExcludedFromBuild="true" 10990 > 10991 <Tool 10992 Name="VCCLCompilerTool" 10993 /> 10994 </FileConfiguration> 10995 <FileConfiguration 10996 Name="Release|Win32" 10997 ExcludedFromBuild="true" 10998 > 10999 <Tool 11000 Name="VCCLCompilerTool" 11001 /> 11002 </FileConfiguration> 11003 <FileConfiguration 11004 Name="Debug_Cairo_CFLite|Win32" 11005 ExcludedFromBuild="true" 11006 > 11007 <Tool 11008 Name="VCCLCompilerTool" 11009 /> 11010 </FileConfiguration> 11011 <FileConfiguration 11012 Name="Release_Cairo_CFLite|Win32" 11013 ExcludedFromBuild="true" 11014 > 11015 <Tool 11016 Name="VCCLCompilerTool" 11017 /> 11018 </FileConfiguration> 11019 <FileConfiguration 11020 Name="Debug_All|Win32" 11021 ExcludedFromBuild="true" 11022 > 11023 <Tool 11024 Name="VCCLCompilerTool" 11025 /> 11026 </FileConfiguration> 11027 <FileConfiguration 11028 Name="Production|Win32" 11029 ExcludedFromBuild="true" 11030 > 11031 <Tool 11032 Name="VCCLCompilerTool" 11033 /> 11034 </FileConfiguration> 11035 </File> 11036 <File 11037 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamEvent.h" 11038 > 11039 </File> 11040 <File 10985 11041 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamList.cpp" 10986 11042 > … … 13820 13876 <File 13821 13877 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoUsageCallback.h" 13822 >13823 </File>13824 <File13825 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStreamEvent.cpp"13826 >13827 <FileConfiguration13828 Name="Debug|Win32"13829 ExcludedFromBuild="true"13830 >13831 <Tool13832 Name="VCCLCompilerTool"13833 />13834 </FileConfiguration>13835 <FileConfiguration13836 Name="Release|Win32"13837 ExcludedFromBuild="true"13838 >13839 <Tool13840 Name="VCCLCompilerTool"13841 />13842 </FileConfiguration>13843 <FileConfiguration13844 Name="Debug_Cairo_CFLite|Win32"13845 ExcludedFromBuild="true"13846 >13847 <Tool13848 Name="VCCLCompilerTool"13849 />13850 </FileConfiguration>13851 <FileConfiguration13852 Name="Release_Cairo_CFLite|Win32"13853 ExcludedFromBuild="true"13854 >13855 <Tool13856 Name="VCCLCompilerTool"13857 />13858 </FileConfiguration>13859 <FileConfiguration13860 Name="Debug_All|Win32"13861 ExcludedFromBuild="true"13862 >13863 <Tool13864 Name="VCCLCompilerTool"13865 />13866 </FileConfiguration>13867 <FileConfiguration13868 Name="Production|Win32"13869 ExcludedFromBuild="true"13870 >13871 <Tool13872 Name="VCCLCompilerTool"13873 />13874 </FileConfiguration>13875 </File>13876 <File13877 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStreamEvent.h"13878 13878 > 13879 13879 </File> … … 25282 25282 Name="p2p" 25283 25283 > 25284 <File 25285 RelativePath="..\p2p\MediaStreamEvent.cpp" 25286 > 25287 </File> 25288 <File 25289 RelativePath="..\p2p\MediaStreamEvent.h" 25290 > 25291 </File> 25284 25292 <File 25285 25293 RelativePath="..\p2p\PeerConnection.cpp" … … 48583 48591 </File> 48584 48592 <File 48585 RelativePath="..\dom\StreamEvent.cpp"48586 >48587 <FileConfiguration48588 Name="Debug|Win32"48589 ExcludedFromBuild="true"48590 >48591 <Tool48592 Name="VCCLCompilerTool"48593 />48594 </FileConfiguration>48595 <FileConfiguration48596 Name="Release|Win32"48597 ExcludedFromBuild="true"48598 >48599 <Tool48600 Name="VCCLCompilerTool"48601 />48602 </FileConfiguration>48603 <FileConfiguration48604 Name="Debug_Cairo_CFLite|Win32"48605 ExcludedFromBuild="true"48606 >48607 <Tool48608 Name="VCCLCompilerTool"48609 />48610 </FileConfiguration>48611 <FileConfiguration48612 Name="Release_Cairo_CFLite|Win32"48613 ExcludedFromBuild="true"48614 >48615 <Tool48616 Name="VCCLCompilerTool"48617 />48618 </FileConfiguration>48619 <FileConfiguration48620 Name="Debug_All|Win32"48621 ExcludedFromBuild="true"48622 >48623 <Tool48624 Name="VCCLCompilerTool"48625 />48626 </FileConfiguration>48627 <FileConfiguration48628 Name="Production|Win32"48629 ExcludedFromBuild="true"48630 >48631 <Tool48632 Name="VCCLCompilerTool"48633 />48634 </FileConfiguration>48635 </File>48636 <File48637 RelativePath="..\dom\StreamEvent.h"48638 >48639 </File>48640 <File48641 48593 RelativePath="..\dom\StringCallback.cpp" 48642 48594 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r92304 r92365 1144 1144 499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1145 1145 499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1146 49A2CFD913E9787E00579F13 /* MediaStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A2CFD613E9787E00579F13 /* MediaStreamEvent.cpp */; }; 1147 49A2CFDA13E9787E00579F13 /* MediaStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A2CFD713E9787E00579F13 /* MediaStreamEvent.h */; }; 1148 49A2D39413E981A300579F13 /* JSMediaStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A2D39213E981A300579F13 /* JSMediaStreamEvent.cpp */; }; 1149 49A2D39513E981A300579F13 /* JSMediaStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A2D39313E981A300579F13 /* JSMediaStreamEvent.h */; }; 1146 1150 49A5A4FE13E2F01E00CFDAE0 /* PeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A5A4F813E2F01E00CFDAE0 /* PeerConnection.cpp */; }; 1147 1151 49A5A4FF13E2F01E00CFDAE0 /* PeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A5A4F913E2F01E00CFDAE0 /* PeerConnection.h */; }; 1148 1152 49A5A50113E2F01E00CFDAE0 /* SignalingCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A5A4FB13E2F01E00CFDAE0 /* SignalingCallback.h */; }; 1149 49A85B6B138D573A00ECB7B3 /* StreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */; };1150 49A85B6C138D573A00ECB7B3 /* StreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A85B69138D573A00ECB7B3 /* StreamEvent.h */; };1151 49A85B77138D58EE00ECB7B3 /* JSStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */; };1152 49A85B78138D58EE00ECB7B3 /* JSStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */; };1153 1153 49BE30D213D9747B003808A9 /* JSPeerConnectionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BE30D113D9747B003808A9 /* JSPeerConnectionCustom.cpp */; }; 1154 1154 49BE30F313D97646003808A9 /* JSPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BE30EF13D97646003808A9 /* JSPeerConnection.cpp */; }; … … 7712 7712 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsLayerCA.h; path = ca/GraphicsLayerCA.h; sourceTree = "<group>"; }; 7713 7713 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAAnimation.h; path = ca/PlatformCAAnimation.h; sourceTree = "<group>"; }; 7714 49A2CFD613E9787E00579F13 /* MediaStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaStreamEvent.cpp; path = p2p/MediaStreamEvent.cpp; sourceTree = "<group>"; }; 7715 49A2CFD713E9787E00579F13 /* MediaStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaStreamEvent.h; path = p2p/MediaStreamEvent.h; sourceTree = "<group>"; }; 7716 49A2CFD813E9787E00579F13 /* MediaStreamEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MediaStreamEvent.idl; path = p2p/MediaStreamEvent.idl; sourceTree = "<group>"; }; 7717 49A2D39213E981A300579F13 /* JSMediaStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamEvent.cpp; sourceTree = "<group>"; }; 7718 49A2D39313E981A300579F13 /* JSMediaStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamEvent.h; sourceTree = "<group>"; }; 7714 7719 49A5A4F813E2F01E00CFDAE0 /* PeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PeerConnection.cpp; path = p2p/PeerConnection.cpp; sourceTree = "<group>"; }; 7715 7720 49A5A4F913E2F01E00CFDAE0 /* PeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeerConnection.h; path = p2p/PeerConnection.h; sourceTree = "<group>"; }; … … 7717 7722 49A5A4FB13E2F01E00CFDAE0 /* SignalingCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignalingCallback.h; path = p2p/SignalingCallback.h; sourceTree = "<group>"; }; 7718 7723 49A5A4FC13E2F01E00CFDAE0 /* SignalingCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SignalingCallback.idl; path = p2p/SignalingCallback.idl; sourceTree = "<group>"; }; 7719 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamEvent.cpp; sourceTree = "<group>"; };7720 49A85B69138D573A00ECB7B3 /* StreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamEvent.h; sourceTree = "<group>"; };7721 49A85B6A138D573A00ECB7B3 /* StreamEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = StreamEvent.idl; sourceTree = "<group>"; };7722 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStreamEvent.cpp; sourceTree = "<group>"; };7723 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStreamEvent.h; sourceTree = "<group>"; };7724 7724 49BE30D113D9747B003808A9 /* JSPeerConnectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPeerConnectionCustom.cpp; sourceTree = "<group>"; }; 7725 7725 49BE30EF13D97646003808A9 /* JSPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPeerConnection.cpp; sourceTree = "<group>"; }; … … 14058 14058 isa = PBXGroup; 14059 14059 children = ( 14060 49A2CFD613E9787E00579F13 /* MediaStreamEvent.cpp */, 14061 49A2CFD713E9787E00579F13 /* MediaStreamEvent.h */, 14062 49A2CFD813E9787E00579F13 /* MediaStreamEvent.idl */, 14060 14063 49A5A4F813E2F01E00CFDAE0 /* PeerConnection.cpp */, 14061 14064 49A5A4F913E2F01E00CFDAE0 /* PeerConnection.h */, … … 17307 17310 B1E545D713462B0B0092A545 /* JSMediaStream.cpp */, 17308 17311 B1E545D813462B0B0092A545 /* JSMediaStream.h */, 17312 49A2D39213E981A300579F13 /* JSMediaStreamEvent.cpp */, 17313 49A2D39313E981A300579F13 /* JSMediaStreamEvent.h */, 17309 17314 B14353F6138EA95B00D53276 /* JSMediaStreamList.cpp */, 17310 17315 B14353F7138EA95B00D53276 /* JSMediaStreamList.h */, … … 17341 17346 75415D53129AB2D2003AD669 /* JSSpeechInputResultList.cpp */, 17342 17347 75415D54129AB2D2003AD669 /* JSSpeechInputResultList.h */, 17343 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */,17344 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */,17345 17348 65DF31EF09D1CC60000BE325 /* JSText.cpp */, 17346 17349 65DF31F009D1CC60000BE325 /* JSText.h */, … … 19548 19551 53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */, 19549 19552 53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */, 19553 508CCA4E13CF106B003151F3 /* RenderFlowThread.cpp */, 19554 508CCA4D13CF106B003151F3 /* RenderFlowThread.h */, 19550 19555 A871DECC0A1530C700B12A68 /* RenderFrame.cpp */, 19551 19556 A871DECB0A1530C700B12A68 /* RenderFrame.h */, … … 19671 19676 37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */, 19672 19677 BCA257141293C010007A263D /* VerticalPositionCache.h */, 19673 508CCA4D13CF106B003151F3 /* RenderFlowThread.h */,19674 508CCA4E13CF106B003151F3 /* RenderFlowThread.cpp */,19675 19678 ); 19676 19679 path = rendering; … … 19968 19971 BC7FA62C0D1F0EFF00DB22A9 /* StaticNodeList.cpp */, 19969 19972 BC7FA62B0D1F0EFF00DB22A9 /* StaticNodeList.h */, 19970 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */,19971 49A85B69138D573A00ECB7B3 /* StreamEvent.h */,19972 49A85B6A138D573A00ECB7B3 /* StreamEvent.idl */,19973 19973 8102C5871325BB1100DDE67A /* StringCallback.cpp */, 19974 19974 81AC6C35131C57D30009A7E0 /* StringCallback.h */, … … 20669 20669 890AE0E11256A07900F5968C /* DirectoryReaderBase.h in Headers */, 20670 20670 893C48031248BD3A002B3D86 /* DirectoryReaderSync.h in Headers */, 20671 490C47CE13E82D1800F7AB82 /* DispatchTask.h in Headers */, 20671 20672 FD31609112B026F700C1A359 /* Distance.h in Headers */, 20672 20673 84730D771248F0B300D3A9C9 /* DistantLightSource.h in Headers */, … … 21981 21982 D3A94A47122DC40F00A37BBC /* JSMediaQueryList.h in Headers */, 21982 21983 B1E545E613462B0B0092A545 /* JSMediaStream.h in Headers */, 21984 49A2D39513E981A300579F13 /* JSMediaStreamEvent.h in Headers */, 21983 21985 B14353F9138EA95B00D53276 /* JSMediaStreamList.h in Headers */, 21984 21986 49C9F48F13D57D320052600A /* JSMediaStreamTrack.h in Headers */, … … 22054 22056 892CF20E134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h in Headers */, 22055 22057 892CF212134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h in Headers */, 22056 49A85B78138D58EE00ECB7B3 /* JSStreamEvent.h in Headers */,22057 22058 0FF5026A102BA9430066F39A /* JSStyleMedia.h in Headers */, 22058 22059 BCE0139B0C0BEF180043860A /* JSStyleSheet.h in Headers */, … … 22304 22305 9728C3141268E4390041E89B /* MarkupAccumulator.h in Headers */, 22305 22306 00A629C113D0BEC70050AC52 /* MarkupTokenBase.h in Headers */, 22307 00C60E4213D797AE0092A275 /* MarkupTokenizerBase.h in Headers */, 22306 22308 00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h in Headers */, 22307 00C60E4213D797AE0092A275 /* MarkupTokenizerBase.h in Headers */,22308 22309 FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */, 22309 22310 44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */, … … 22336 22337 B1E54594134629C10092A545 /* MediaStreamClient.h in Headers */, 22337 22338 B1E54598134629C10092A545 /* MediaStreamController.h in Headers */, 22339 49A2CFDA13E9787E00579F13 /* MediaStreamEvent.h in Headers */, 22338 22340 B1E54596134629C10092A545 /* MediaStreamFrameController.h in Headers */, 22339 22341 B14353D6138EA8ED00D53276 /* MediaStreamList.h in Headers */, … … 22515 22517 FD31603E12B0267600C1A359 /* RealtimeAnalyserNode.h in Headers */, 22516 22518 BC4368E80C226E32005EFB5F /* Rect.h in Headers */, 22519 BCAB418213E356E800D8AAF3 /* Region.h in Headers */, 22517 22520 85031B4C0A44EFC700F992E0 /* RegisteredEventListener.h in Headers */, 22518 22521 B2C3DA2D0D006C1D00EF6F26 /* RegularExpression.h in Headers */, … … 22538 22541 066C77310AB603FD00238CC4 /* RenderFileUploadControl.h in Headers */, 22539 22542 53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */, 22543 508CCA4F13CF106B003151F3 /* RenderFlowThread.h in Headers */, 22540 22544 A871DED30A1530C700B12A68 /* RenderFrame.h in Headers */, 22541 22545 0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */, … … 22577 22581 A43BF59D1149292800C643CA /* RenderProgress.h in Headers */, 22578 22582 5A574F25131DB93900471B88 /* RenderQuote.h in Headers */, 22583 D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */, 22579 22584 A871DFE30A15376B00B12A68 /* RenderReplaced.h in Headers */, 22580 22585 BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */, … … 22734 22739 0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */, 22735 22740 A74C2D3C13811E0D00F83572 /* ShadowContentElement.h in Headers */, 22741 BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */, 22736 22742 A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */, 22737 BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,22738 22743 A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */, 22739 22744 A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */, … … 22818 22823 3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */, 22819 22824 3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */, 22820 49A85B6C138D573A00ECB7B3 /* StreamEvent.h in Headers */,22821 22825 81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */, 22822 22826 65488D6B0DD5A83D009D83B2 /* StringSourceProvider.h in Headers */, … … 23320 23324 977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */, 23321 23325 FD537353137B651800008DCE /* ZeroPole.h in Headers */, 23322 508CCA4F13CF106B003151F3 /* RenderFlowThread.h in Headers */,23323 D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */,23324 BCAB418213E356E800D8AAF3 /* Region.h in Headers */,23325 490C47CE13E82D1800F7AB82 /* DispatchTask.h in Headers */,23326 23326 ); 23327 23327 runOnlyForDeploymentPostprocessing = 0; … … 24956 24956 D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */, 24957 24957 B1E545E513462B0B0092A545 /* JSMediaStream.cpp in Sources */, 24958 49A2D39413E981A300579F13 /* JSMediaStreamEvent.cpp in Sources */, 24958 24959 B14353F8138EA95B00D53276 /* JSMediaStreamList.cpp in Sources */, 24959 24960 49C9F48E13D57D320052600A /* JSMediaStreamTrack.cpp in Sources */, … … 25047 25048 892CF20D134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp in Sources */, 25048 25049 892CF211134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp in Sources */, 25049 49A85B77138D58EE00ECB7B3 /* JSStreamEvent.cpp in Sources */,25050 25050 0FF50269102BA9430066F39A /* JSStyleMedia.cpp in Sources */, 25051 25051 BCE0139A0C0BEF180043860A /* JSStyleSheet.cpp in Sources */, … … 25341 25341 B1E5457D1346291F0092A545 /* MediaStream.cpp in Sources */, 25342 25342 B1E54597134629C10092A545 /* MediaStreamController.cpp in Sources */, 25343 49A2CFD913E9787E00579F13 /* MediaStreamEvent.cpp in Sources */, 25343 25344 B1E54595134629C10092A545 /* MediaStreamFrameController.cpp in Sources */, 25344 25345 B14353D5138EA8ED00D53276 /* MediaStreamList.cpp in Sources */, … … 25475 25476 FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */, 25476 25477 FD31603D12B0267600C1A359 /* RealtimeAnalyserNode.cpp in Sources */, 25478 BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */, 25477 25479 85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */, 25478 25480 B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */, … … 25498 25500 066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */, 25499 25501 53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */, 25502 508CCA5013CF106B003151F3 /* RenderFlowThread.cpp in Sources */, 25500 25503 A871DED40A1530C700B12A68 /* RenderFrame.cpp in Sources */, 25501 25504 0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */, … … 25536 25539 A43BF59C1149292800C643CA /* RenderProgress.cpp in Sources */, 25537 25540 5A574F24131DB93900471B88 /* RenderQuote.cpp in Sources */, 25541 D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */, 25538 25542 A871DFE20A15376B00B12A68 /* RenderReplaced.cpp in Sources */, 25539 25543 BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */, … … 25655 25659 0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */, 25656 25660 A766CF8C13810E0C0011A0B3 /* ShadowContentElement.cpp in Sources */, 25661 BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */, 25657 25662 A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */, 25658 BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,25659 25663 A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */, 25660 25664 A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */, … … 25728 25732 C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */, 25729 25733 3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */, 25730 49A85B6B138D573A00ECB7B3 /* StreamEvent.cpp in Sources */,25731 25734 B2C3DA300D006C1D00EF6F26 /* String.cpp in Sources */, 25732 25735 8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */, … … 26115 26118 977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */, 26116 26119 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */, 26117 508CCA5013CF106B003151F3 /* RenderFlowThread.cpp in Sources */,26118 D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */,26119 BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */,26120 26120 ); 26121 26121 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/js/JSEventCustom.cpp
r88343 r92365 112 112 113 113 #if ENABLE(MEDIA_STREAM) 114 #include "JS StreamEvent.h"115 #include " StreamEvent.h"114 #include "JSMediaStreamEvent.h" 115 #include "MediaStreamEvent.h" 116 116 #endif 117 117 … … 215 215 #endif 216 216 #if ENABLE(MEDIA_STREAM) 217 else if (event->is StreamEvent())218 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, StreamEvent, event);217 else if (event->isMediaStreamEvent()) 218 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, MediaStreamEvent, event); 219 219 #endif 220 220 else -
trunk/Source/WebCore/bindings/v8/custom/V8EventCustom.cpp
r88343 r92365 58 58 #include "V8SpeechInputEvent.h" 59 59 #include "V8StorageEvent.h" 60 #include "V8StreamEvent.h"61 60 #include "V8TextEvent.h" 62 61 #include "V8TouchEvent.h" … … 74 73 #include "V8AudioProcessingEvent.h" 75 74 #include "V8OfflineAudioCompletionEvent.h" 75 #endif 76 77 #if ENABLE(MEDIA_STREAM) 78 #include "V8MediaStreamEvent.h" 76 79 #endif 77 80 … … 187 190 #endif 188 191 #if ENABLE(MEDIA_STREAM) 189 if (impl->is StreamEvent())190 return toV8(static_cast< StreamEvent*>(impl));192 if (impl->isMediaStreamEvent()) 193 return toV8(static_cast<MediaStreamEvent*>(impl)); 191 194 #endif 192 195 return V8Event::wrap(impl); -
trunk/Source/WebCore/dom/DOMAllInOne.cpp
r91548 r92365 121 121 #include "StaticHashSetNodeList.cpp" 122 122 #include "StaticNodeList.cpp" 123 #include "StreamEvent.cpp"124 123 #include "StyleElement.cpp" 125 124 #include "StyledElement.cpp" -
trunk/Source/WebCore/dom/Event.cpp
r92266 r92365 252 252 253 253 #if ENABLE(MEDIA_STREAM) 254 bool Event::is StreamEvent() const254 bool Event::isMediaStreamEvent() const 255 255 { 256 256 return false; -
trunk/Source/WebCore/dom/Event.h
r92266 r92365 149 149 #endif 150 150 #if ENABLE(MEDIA_STREAM) 151 virtual bool is StreamEvent() const;151 virtual bool isMediaStreamEvent() const; 152 152 #endif 153 153 bool propagationStopped() const { return m_propagationStopped || m_immediatePropagationStopped; } -
trunk/Source/WebCore/p2p/MediaStreamEvent.cpp
r92364 r92365 24 24 25 25 #include "config.h" 26 #include " StreamEvent.h"26 #include "MediaStreamEvent.h" 27 27 28 28 #if ENABLE(MEDIA_STREAM) … … 33 33 namespace WebCore { 34 34 35 PassRefPtr< StreamEvent>StreamEvent::create()35 PassRefPtr<MediaStreamEvent> MediaStreamEvent::create() 36 36 { 37 return adoptRef(new StreamEvent);37 return adoptRef(new MediaStreamEvent); 38 38 } 39 39 40 PassRefPtr< StreamEvent>StreamEvent::create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)40 PassRefPtr<MediaStreamEvent> MediaStreamEvent::create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream) 41 41 { 42 return adoptRef(new StreamEvent(type, canBubble, cancelable, stream));42 return adoptRef(new MediaStreamEvent(type, canBubble, cancelable, stream)); 43 43 } 44 44 45 45 46 StreamEvent::StreamEvent()46 MediaStreamEvent::MediaStreamEvent() 47 47 { 48 48 } 49 49 50 StreamEvent::StreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)50 MediaStreamEvent::MediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream) 51 51 : Event(type, canBubble, cancelable) 52 52 , m_stream(stream) … … 54 54 } 55 55 56 StreamEvent::~StreamEvent()56 MediaStreamEvent::~MediaStreamEvent() 57 57 { 58 58 } 59 59 60 void StreamEvent::initStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)60 void MediaStreamEvent::initMediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream) 61 61 { 62 62 if (dispatched()) … … 68 68 } 69 69 70 PassRefPtr<MediaStream> StreamEvent::stream() const70 PassRefPtr<MediaStream> MediaStreamEvent::stream() const 71 71 { 72 72 return m_stream; -
trunk/Source/WebCore/p2p/MediaStreamEvent.h
r92364 r92365 23 23 */ 24 24 25 #ifndef StreamEvent_h26 #define StreamEvent_h25 #ifndef MediaStreamEvent_h 26 #define MediaStreamEvent_h 27 27 28 28 #if ENABLE(MEDIA_STREAM) … … 35 35 class Stream; 36 36 37 class StreamEvent : public Event {37 class MediaStreamEvent : public Event { 38 38 public: 39 virtual ~ StreamEvent();39 virtual ~MediaStreamEvent(); 40 40 41 static PassRefPtr< StreamEvent> create();42 static PassRefPtr< StreamEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);41 static PassRefPtr<MediaStreamEvent> create(); 42 static PassRefPtr<MediaStreamEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>); 43 43 44 void init StreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);44 void initMediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>); 45 45 46 46 // From EventTarget. … … 50 50 51 51 private: 52 StreamEvent();53 StreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);52 MediaStreamEvent(); 53 MediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>); 54 54 55 55 RefPtr<MediaStream> m_stream; … … 60 60 #endif // ENABLE(MEDIA_STREAM) 61 61 62 #endif // StreamEvent_h62 #endif // MediaStreamEvent_h -
trunk/Source/WebCore/p2p/MediaStreamEvent.idl
r92364 r92365 23 23 */ 24 24 25 module events{25 module p2p { 26 26 27 // According to the WHATWG specification , section 9.7:28 // http://www.whatwg.org/specs/web-apps/current-work/multipage/ dnd.html#streamevent27 // According to the WHATWG specification: 28 // http://www.whatwg.org/specs/web-apps/current-work/multipage/video-conferencing-and-peer-to-peer-communication.html#mediastreamevent 29 29 interface [ 30 30 Conditional=MEDIA_STREAM, 31 ] StreamEvent : Event {31 ] MediaStreamEvent : Event { 32 32 readonly attribute MediaStream stream; 33 33 34 void init StreamEvent(in [Optional=CallWithDefaultValue] DOMString typeArg,35 in [Optional=CallWithDefaultValue] boolean canBubbleArg,36 in [Optional=CallWithDefaultValue] boolean cancelableArg,37 in [Optional=CallWithDefaultValue] MediaStream streamArg);34 void initMediaStreamEvent(in [Optional=CallWithDefaultValue] DOMString typeArg, 35 in [Optional=CallWithDefaultValue] boolean canBubbleArg, 36 in [Optional=CallWithDefaultValue] boolean cancelableArg, 37 in [Optional=CallWithDefaultValue] MediaStream streamArg); 38 38 }; 39 39 -
trunk/Source/WebCore/p2p/PeerConnection.cpp
r92304 r92365 33 33 #include "EventNames.h" 34 34 #include "MediaStream.h" 35 #include "MediaStreamEvent.h" 35 36 #include "MediaStreamList.h" 36 37 #include "MessageEvent.h" 37 38 #include "ScriptExecutionContext.h" 38 39 #include "SignalingCallback.h" 39 #include "StreamEvent.h"40 40 41 41 namespace WebCore { … … 294 294 { 295 295 RefPtr<MediaStream> s = stream; 296 dispatchEvent( StreamEvent::create(name, false, false, s));296 dispatchEvent(MediaStreamEvent::create(name, false, false, s)); 297 297 } 298 298
Note: See TracChangeset
for help on using the changeset viewer.