Changeset 88343 in webkit
- Timestamp:
- Jun 8, 2011 6:24:52 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r87780 r88343 1958 1958 dom/GeneratedStream.cpp 1959 1959 dom/Stream.cpp 1960 dom/StreamEvent.cpp 1960 1961 page/MediaStreamController.cpp 1961 1962 page/MediaStreamFrameController.cpp … … 1965 1966 dom/GeneratedStream.idl 1966 1967 dom/Stream.idl 1968 dom/StreamEvent.idl 1967 1969 page/NavigatorUserMediaError.idl 1968 1970 ) -
trunk/Source/WebCore/ChangeLog
r88341 r88343 1 2011-06-08 Tommy Widenflycht <tommyw@google.com> 2 3 Reviewed by Tony Gentilcore. 4 5 StreamEvent 6 7 Media Stream PeerConnection API: adding StreamEvent class 8 https://bugs.webkit.org/show_bug.cgi?id=61537 9 10 Tests for the Media Stream API will be provided by the bug 56587. 11 12 * CMakeLists.txt: 13 * CodeGenerators.pri: 14 * DerivedSources.cpp: 15 * DerivedSources.make: 16 * GNUmakefile.list.am: 17 * WebCore.gypi: 18 * WebCore.pro: 19 * WebCore.vcproj/WebCore.vcproj: 20 * WebCore.xcodeproj/project.pbxproj: 21 * bindings/js/JSEventCustom.cpp: 22 (WebCore::toJS): 23 * bindings/v8/custom/V8EventCustom.cpp: 24 (WebCore::toV8): 25 * dom/DOMAllInOne.cpp: 26 * dom/Event.cpp: 27 (WebCore::Event::isStreamEvent): 28 * dom/Event.h: 29 * dom/StreamEvent.cpp: Added. 30 (WebCore::StreamEvent::create): 31 (WebCore::StreamEvent::StreamEvent): 32 (WebCore::StreamEvent::~StreamEvent): 33 (WebCore::StreamEvent::initStreamEvent): 34 (WebCore::StreamEvent::stream): 35 * dom/StreamEvent.h: Added. 36 (WebCore::StreamEvent::isStreamEvent): 37 * dom/StreamEvent.idl: Added. 38 1 39 2011-06-08 Tommy Widenflycht <tommyw@google.com> 2 40 -
trunk/Source/WebCore/CodeGenerators.pri
r87961 r88343 157 157 dom/Range.idl \ 158 158 dom/Stream.idl \ 159 dom/StreamEvent.idl \ 159 160 dom/StringCallback.idl \ 160 161 dom/Text.idl \ -
trunk/Source/WebCore/DerivedSources.cpp
r88020 r88343 293 293 #include "JSStorageInfoUsageCallback.cpp" 294 294 #include "JSStream.cpp" 295 #include "JSStreamEvent.cpp" 295 296 #include "JSStringCallback.cpp" 296 297 #include "JSStyleMedia.cpp" -
trunk/Source/WebCore/DerivedSources.make
r88020 r88343 366 366 StorageInfoUsageCallback \ 367 367 Stream \ 368 StreamEvent \ 368 369 StringCallback \ 369 370 SVGAElement \ -
trunk/Source/WebCore/GNUmakefile.list.am
r88020 r88343 462 462 DerivedSources/WebCore/JSStream.cpp \ 463 463 DerivedSources/WebCore/JSStream.h \ 464 DerivedSources/WebCore/JSStreamEvent.cpp \ 465 DerivedSources/WebCore/JSStreamEvent.h \ 464 466 DerivedSources/WebCore/JSStyleMedia.cpp \ 465 467 DerivedSources/WebCore/JSStyleMedia.h \ … … 1273 1275 Source/WebCore/dom/Stream.cpp \ 1274 1276 Source/WebCore/dom/Stream.h \ 1277 Source/WebCore/dom/StreamEvent.cpp \ 1278 Source/WebCore/dom/Streamevent.h \ 1275 1279 Source/WebCore/dom/StyledElement.cpp \ 1276 1280 Source/WebCore/dom/StyledElement.h \ -
trunk/Source/WebCore/WebCore.gypi
r88332 r88343 1173 1173 'dom/RequestAnimationFrameCallback.idl', 1174 1174 'dom/Stream.idl', 1175 'dom/StreamEvent.idl', 1175 1176 'dom/StringCallback.idl', 1176 1177 'dom/Text.idl', … … 2582 2583 'dom/Stream.cpp', 2583 2584 'dom/Stream.h', 2585 'dom/StreamEvent.cpp', 2586 'dom/StreamEvent.h', 2584 2587 'dom/StringCallback.cpp', 2585 2588 'dom/StringCallback.h', -
trunk/Source/WebCore/WebCore.pro
r88304 r88343 3151 3151 dom/GeneratedStream.h \ 3152 3152 dom/Stream.h \ 3153 dom/StreamEvent.h \ 3153 3154 page/CallbackTask.h \ 3154 3155 page/MediaStreamClient.h \ … … 3162 3163 dom/GeneratedStream.cpp \ 3163 3164 dom/Stream.cpp \ 3165 dom/StreamEvent.cpp \ 3164 3166 page/MediaStreamController.cpp \ 3165 3167 page/MediaStreamFrameController.cpp -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r88020 r88343 13655 13655 </File> 13656 13656 <File 13657 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStreamEvent.cpp" 13658 > 13659 <FileConfiguration 13660 Name="Debug|Win32" 13661 ExcludedFromBuild="true" 13662 > 13663 <Tool 13664 Name="VCCLCompilerTool" 13665 /> 13666 </FileConfiguration> 13667 <FileConfiguration 13668 Name="Release|Win32" 13669 ExcludedFromBuild="true" 13670 > 13671 <Tool 13672 Name="VCCLCompilerTool" 13673 /> 13674 </FileConfiguration> 13675 <FileConfiguration 13676 Name="Debug_Cairo_CFLite|Win32" 13677 ExcludedFromBuild="true" 13678 > 13679 <Tool 13680 Name="VCCLCompilerTool" 13681 /> 13682 </FileConfiguration> 13683 <FileConfiguration 13684 Name="Release_Cairo_CFLite|Win32" 13685 ExcludedFromBuild="true" 13686 > 13687 <Tool 13688 Name="VCCLCompilerTool" 13689 /> 13690 </FileConfiguration> 13691 <FileConfiguration 13692 Name="Debug_All|Win32" 13693 ExcludedFromBuild="true" 13694 > 13695 <Tool 13696 Name="VCCLCompilerTool" 13697 /> 13698 </FileConfiguration> 13699 <FileConfiguration 13700 Name="Production|Win32" 13701 ExcludedFromBuild="true" 13702 > 13703 <Tool 13704 Name="VCCLCompilerTool" 13705 /> 13706 </FileConfiguration> 13707 </File> 13708 <File 13709 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStreamEvent.h" 13710 > 13711 </File> 13712 <File 13657 13713 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStringCallback.cpp" 13658 13714 > … … 47715 47771 </File> 47716 47772 <File 47773 RelativePath="..\dom\StreamEvent.cpp" 47774 > 47775 <FileConfiguration 47776 Name="Debug|Win32" 47777 ExcludedFromBuild="true" 47778 > 47779 <Tool 47780 Name="VCCLCompilerTool" 47781 /> 47782 </FileConfiguration> 47783 <FileConfiguration 47784 Name="Release|Win32" 47785 ExcludedFromBuild="true" 47786 > 47787 <Tool 47788 Name="VCCLCompilerTool" 47789 /> 47790 </FileConfiguration> 47791 <FileConfiguration 47792 Name="Debug_Cairo_CFLite|Win32" 47793 ExcludedFromBuild="true" 47794 > 47795 <Tool 47796 Name="VCCLCompilerTool" 47797 /> 47798 </FileConfiguration> 47799 <FileConfiguration 47800 Name="Release_Cairo_CFLite|Win32" 47801 ExcludedFromBuild="true" 47802 > 47803 <Tool 47804 Name="VCCLCompilerTool" 47805 /> 47806 </FileConfiguration> 47807 <FileConfiguration 47808 Name="Debug_All|Win32" 47809 ExcludedFromBuild="true" 47810 > 47811 <Tool 47812 Name="VCCLCompilerTool" 47813 /> 47814 </FileConfiguration> 47815 <FileConfiguration 47816 Name="Production|Win32" 47817 ExcludedFromBuild="true" 47818 > 47819 <Tool 47820 Name="VCCLCompilerTool" 47821 /> 47822 </FileConfiguration> 47823 </File> 47824 <File 47825 RelativePath="..\dom\StreamEvent.h" 47826 > 47827 </File> 47828 <File 47717 47829 RelativePath="..\dom\StringCallback.cpp" 47718 47830 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r88284 r88343 1081 1081 499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1082 1082 499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1083 49A85B6B138D573A00ECB7B3 /* StreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */; }; 1084 49A85B6C138D573A00ECB7B3 /* StreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A85B69138D573A00ECB7B3 /* StreamEvent.h */; }; 1085 49A85B77138D58EE00ECB7B3 /* JSStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */; }; 1086 49A85B78138D58EE00ECB7B3 /* JSStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */; }; 1083 1087 49B69E5E1254FEED007D57EB /* LoopBlinnClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49B69E551254FEED007D57EB /* LoopBlinnClassifier.cpp */; }; 1084 1088 49B69E5F1254FEED007D57EB /* LoopBlinnClassifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 49B69E561254FEED007D57EB /* LoopBlinnClassifier.h */; }; … … 7672 7676 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsLayerCA.h; path = ca/GraphicsLayerCA.h; sourceTree = "<group>"; }; 7673 7677 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAAnimation.h; path = ca/PlatformCAAnimation.h; sourceTree = "<group>"; }; 7678 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamEvent.cpp; sourceTree = "<group>"; }; 7679 49A85B69138D573A00ECB7B3 /* StreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamEvent.h; sourceTree = "<group>"; }; 7680 49A85B6A138D573A00ECB7B3 /* StreamEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = StreamEvent.idl; sourceTree = "<group>"; }; 7681 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStreamEvent.cpp; sourceTree = "<group>"; }; 7682 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStreamEvent.h; sourceTree = "<group>"; }; 7674 7683 49B69E551254FEED007D57EB /* LoopBlinnClassifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LoopBlinnClassifier.cpp; path = gpu/LoopBlinnClassifier.cpp; sourceTree = "<group>"; }; 7675 7684 49B69E561254FEED007D57EB /* LoopBlinnClassifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LoopBlinnClassifier.h; path = gpu/LoopBlinnClassifier.h; sourceTree = "<group>"; }; … … 17147 17156 B1E545D713462B0B0092A545 /* JSStream.cpp */, 17148 17157 B1E545D813462B0B0092A545 /* JSStream.h */, 17158 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */, 17159 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */, 17149 17160 65DF31EF09D1CC60000BE325 /* JSText.cpp */, 17150 17161 65DF31F009D1CC60000BE325 /* JSText.h */, … … 19694 19705 B1E545751346291F0092A545 /* Stream.h */, 19695 19706 B1E545761346291F0092A545 /* Stream.idl */, 19707 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */, 19708 49A85B69138D573A00ECB7B3 /* StreamEvent.h */, 19709 49A85B6A138D573A00ECB7B3 /* StreamEvent.idl */, 19696 19710 8102C5871325BB1100DDE67A /* StringCallback.cpp */, 19697 19711 81AC6C35131C57D30009A7E0 /* StringCallback.h */, … … 23142 23156 2E2445F71395893A004B6C19 /* OperationNotAllowedException.h in Headers */, 23143 23157 2E24476913959173004B6C19 /* JSOperationNotAllowedException.h in Headers */, 23158 49A85B6C138D573A00ECB7B3 /* StreamEvent.h in Headers */, 23159 49A85B78138D58EE00ECB7B3 /* JSStreamEvent.h in Headers */, 23144 23160 ); 23145 23161 runOnlyForDeploymentPostprocessing = 0; … … 25871 25887 4496E3A2139813CB003EE32A /* JSSVGMPathElement.cpp in Sources */, 25872 25888 2E24476813959173004B6C19 /* JSOperationNotAllowedException.cpp in Sources */, 25889 49A85B6B138D573A00ECB7B3 /* StreamEvent.cpp in Sources */, 25890 49A85B77138D58EE00ECB7B3 /* JSStreamEvent.cpp in Sources */, 25873 25891 ); 25874 25892 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/js/JSEventCustom.cpp
r86315 r88343 111 111 #endif 112 112 113 #if ENABLE(MEDIA_STREAM) 114 #include "JSStreamEvent.h" 115 #include "StreamEvent.h" 116 #endif 117 113 118 using namespace JSC; 114 119 … … 209 214 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CloseEvent, event); 210 215 #endif 216 #if ENABLE(MEDIA_STREAM) 217 else if (event->isStreamEvent()) 218 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, StreamEvent, event); 219 #endif 211 220 else 212 221 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, Event, event); -
trunk/Source/WebCore/bindings/v8/custom/V8EventCustom.cpp
r86315 r88343 58 58 #include "V8SpeechInputEvent.h" 59 59 #include "V8StorageEvent.h" 60 #include "V8StreamEvent.h" 60 61 #include "V8TextEvent.h" 61 62 #include "V8TouchEvent.h" … … 185 186 return toV8(static_cast<CloseEvent*>(impl)); 186 187 #endif 188 #if ENABLE(MEDIA_STREAM) 189 if (impl->isStreamEvent()) 190 return toV8(static_cast<StreamEvent*>(impl)); 191 #endif 187 192 return V8Event::wrap(impl); 188 193 } -
trunk/Source/WebCore/dom/DOMAllInOne.cpp
r87293 r88343 120 120 #include "StaticNodeList.cpp" 121 121 #include "Stream.cpp" 122 #include "StreamEvent.cpp" 122 123 #include "StyleElement.cpp" 123 124 #include "StyledElement.cpp" -
trunk/Source/WebCore/dom/Event.cpp
r86315 r88343 251 251 #endif 252 252 253 #if ENABLE(MEDIA_STREAM) 254 bool Event::isStreamEvent() const 255 { 256 return false; 257 } 258 #endif 259 253 260 bool Event::fromUserGesture() 254 261 { -
trunk/Source/WebCore/dom/Event.h
r86315 r88343 148 148 virtual bool isCloseEvent() const; 149 149 #endif 150 #if ENABLE(MEDIA_STREAM) 151 virtual bool isStreamEvent() const; 152 #endif 150 153 bool fromUserGesture(); 151 154
Note: See TracChangeset
for help on using the changeset viewer.