MediaStream API: Rename StreamEvent to MediaStreamEvent
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Aug 2011 10:07:10 +0000 (10:07 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Aug 2011 10:07:10 +0000 (10:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=65669

Patch by Tommy Widenflycht <tommyw@google.com> on 2011-08-04
Reviewed by Tony Gentilcore.

* CMakeLists.txt:
* CodeGenerators.pri:
* DerivedSources.cpp:
* DerivedSources.make:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSEventCustom.cpp:
(WebCore::toJS):
* bindings/v8/custom/V8EventCustom.cpp:
(WebCore::toV8):
* dom/DOMAllInOne.cpp:
* dom/Event.cpp:
(WebCore::Event::isMediaStreamEvent):
* dom/Event.h:
* p2p/MediaStreamEvent.cpp: Renamed from Source/WebCore/dom/StreamEvent.cpp.
(WebCore::MediaStreamEvent::create):
(WebCore::MediaStreamEvent::MediaStreamEvent):
(WebCore::MediaStreamEvent::~MediaStreamEvent):
(WebCore::MediaStreamEvent::initMediaStreamEvent):
(WebCore::MediaStreamEvent::stream):
* p2p/MediaStreamEvent.h: Renamed from Source/WebCore/dom/StreamEvent.h.
(WebCore::MediaStreamEvent::isMediaStreamEvent):
* p2p/MediaStreamEvent.idl: Renamed from Source/WebCore/dom/StreamEvent.idl.
* p2p/PeerConnection.cpp:
(WebCore::PeerConnection::dispatchStreamEvent):

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

19 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/CodeGenerators.pri
Source/WebCore/DerivedSources.cpp
Source/WebCore/DerivedSources.make
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSEventCustom.cpp
Source/WebCore/bindings/v8/custom/V8EventCustom.cpp
Source/WebCore/dom/DOMAllInOne.cpp
Source/WebCore/dom/Event.cpp
Source/WebCore/dom/Event.h
Source/WebCore/p2p/MediaStreamEvent.cpp [moved from Source/WebCore/dom/StreamEvent.cpp with 73% similarity]
Source/WebCore/p2p/MediaStreamEvent.h [moved from Source/WebCore/dom/StreamEvent.h with 74% similarity]
Source/WebCore/p2p/MediaStreamEvent.idl [moved from Source/WebCore/dom/StreamEvent.idl with 74% similarity]
Source/WebCore/p2p/PeerConnection.cpp

index ceaf230509b808962ffead3d2cb94de7d7cba560..a16de093f753f7831b2029840290d52919269af4 100644 (file)
@@ -2011,7 +2011,7 @@ IF (ENABLE_MEDIA_STREAM)
         dom/MediaStreamList.cpp
         dom/MediaStreamTrack.cpp
         dom/MediaStreamTrackList.cpp
-        dom/StreamEvent.cpp
+        p2p/MediaStreamEvent.cpp
         p2p/PeerConnection.cpp
         page/MediaStreamController.cpp
         page/MediaStreamFrameController.cpp
@@ -2023,7 +2023,7 @@ IF (ENABLE_MEDIA_STREAM)
         dom/MediaStreamList.idl
         dom/MediaStreamTrack.idl
         dom/MediaStreamTrackList.idl
-        dom/StreamEvent.idl
+        p2p/MediaStreamEvent.idl
         p2p/PeerConnection.idl
         p2p/SignalingCallback.idl
         page/NavigatorUserMediaError.idl
index cec51f2b9e6e9ee0dca5231207b75032dc6149c3..9b8bff38c2b41ad1bd9e1b3d6f17dcd236dfaf02 100644 (file)
@@ -1,3 +1,39 @@
+2011-08-04  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Rename StreamEvent to MediaStreamEvent
+        https://bugs.webkit.org/show_bug.cgi?id=65669
+
+        Reviewed by Tony Gentilcore.
+
+        * CMakeLists.txt:
+        * CodeGenerators.pri:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSEventCustom.cpp:
+        (WebCore::toJS):
+        * bindings/v8/custom/V8EventCustom.cpp:
+        (WebCore::toV8):
+        * dom/DOMAllInOne.cpp:
+        * dom/Event.cpp:
+        (WebCore::Event::isMediaStreamEvent):
+        * dom/Event.h:
+        * p2p/MediaStreamEvent.cpp: Renamed from Source/WebCore/dom/StreamEvent.cpp.
+        (WebCore::MediaStreamEvent::create):
+        (WebCore::MediaStreamEvent::MediaStreamEvent):
+        (WebCore::MediaStreamEvent::~MediaStreamEvent):
+        (WebCore::MediaStreamEvent::initMediaStreamEvent):
+        (WebCore::MediaStreamEvent::stream):
+        * p2p/MediaStreamEvent.h: Renamed from Source/WebCore/dom/StreamEvent.h.
+        (WebCore::MediaStreamEvent::isMediaStreamEvent):
+        * p2p/MediaStreamEvent.idl: Renamed from Source/WebCore/dom/StreamEvent.idl.
+        * p2p/PeerConnection.cpp:
+        (WebCore::PeerConnection::dispatchStreamEvent):
+
 2011-08-02  Hans Wennborg  <hans@chromium.org>
 
         IndexedDB: Fix index data invalidation bugs.
index 2496f12d6cd4f666f873bb464ec05a05fa20de7f..e582ba8acfc64e1dc99566be663e454ae79269c5 100644 (file)
@@ -164,7 +164,6 @@ IDL_BINDINGS += \
     dom/ProgressEvent.idl \
     dom/RangeException.idl \
     dom/Range.idl \
-    dom/StreamEvent.idl \
     dom/StringCallback.idl \
     dom/Text.idl \
     dom/TextEvent.idl \
@@ -327,6 +326,7 @@ IDL_BINDINGS += \
     loader/appcache/DOMApplicationCache.idl \
     notifications/Notification.idl \
     notifications/NotificationCenter.idl \
+    p2p/MediaStreamEvent.idl \
     p2p/PeerConnection.idl \
     p2p/SignalingCallback.idl \
     page/BarInfo.idl \
index 5df330e0f441fec5b9b30280712c302479ae9586..c56b189d0baee59d2c02a84a5a2e763ad96c5370 100644 (file)
 #include "JSMediaError.cpp"
 #include "JSMediaList.cpp"
 #include "JSMediaStream.cpp"
+#include "JSMediaStreamEvent.cpp"
 #include "JSMediaStreamList.cpp"
 #include "JSMediaStreamTrack.cpp"
 #include "JSMediaStreamTrackList.cpp"
 #include "JSStorageInfoErrorCallback.cpp"
 #include "JSStorageInfoQuotaCallback.cpp"
 #include "JSStorageInfoUsageCallback.cpp"
-#include "JSStreamEvent.cpp"
 #include "JSStringCallback.cpp"
 #include "JSStyleMedia.cpp"
 #include "JSStyleSheet.cpp"
index 6ac55b037fa7e5f8162adecf932353558f030492..26b60ab3131d9ae4f6f23634171250f6a55c07f8 100644 (file)
@@ -303,6 +303,7 @@ DOM_CLASSES = \
     MediaQueryList \
     MediaQueryListListener \
     MediaStream \
+    MediaStreamEvent \
     MediaStreamList \
     MediaStreamTrack \
     MediaStreamTrackList \
@@ -372,7 +373,6 @@ DOM_CLASSES = \
     StorageInfoErrorCallback \
     StorageInfoQuotaCallback \
     StorageInfoUsageCallback \
-    StreamEvent \
     StringCallback \
     SVGAElement \
     SVGAltGlyphDefElement \
@@ -888,6 +888,7 @@ IDL_INCLUDES = \
     $(WebCore)/fileapi \
     $(WebCore)/html \
     $(WebCore)/css \
+    $(WebCore)/p2p \
     $(WebCore)/page \
     $(WebCore)/notifications \
     $(WebCore)/xml \
index 677f8f05cc6cb670fdd16631fcf10cb36c1a411d..4c835bff398c4920ad854347628ff8ce612c41dc 100644 (file)
@@ -355,6 +355,8 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSMediaList.h \
        DerivedSources/WebCore/JSMediaStream.cpp \
        DerivedSources/WebCore/JSMediaStream.h \
+       DerivedSources/WebCore/JSMediaStreamEvent.cpp \
+       DerivedSources/WebCore/JSMediaStreamEvent.h \
        DerivedSources/WebCore/JSMediaStreamList.cpp \
        DerivedSources/WebCore/JSMediaStreamList.h \
        DerivedSources/WebCore/JSMediaStreamTrack.cpp \
@@ -467,8 +469,6 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSStorageInfoErrorCallback.h \
        DerivedSources/WebCore/JSStorageInfoQuotaCallback.h \
        DerivedSources/WebCore/JSStorageInfoUsageCallback.h \
-       DerivedSources/WebCore/JSStreamEvent.cpp \
-       DerivedSources/WebCore/JSStreamEvent.h \
        DerivedSources/WebCore/JSStyleMedia.cpp \
        DerivedSources/WebCore/JSStyleMedia.h \
        DerivedSources/WebCore/JSStyleSheet.cpp \
@@ -1289,8 +1289,6 @@ webcore_sources += \
        Source/WebCore/dom/StaticHashSetNodeList.h \
        Source/WebCore/dom/StaticNodeList.cpp \
        Source/WebCore/dom/StaticNodeList.h \
-       Source/WebCore/dom/StreamEvent.cpp \
-       Source/WebCore/dom/StreamEvent.h \
        Source/WebCore/dom/StyledElement.cpp \
        Source/WebCore/dom/StyledElement.h \
        Source/WebCore/dom/StyleElement.cpp \
@@ -2196,6 +2194,8 @@ webcore_sources += \
        Source/WebCore/notifications/Notification.cpp \
        Source/WebCore/notifications/Notification.h \
        Source/WebCore/notifications/NotificationPresenter.h \
+       Source/WebCore/p2p/MediaStreamEvent.cpp \
+       Source/WebCore/p2p/MediaStreamEvent.h \
        Source/WebCore/p2p/PeerConnection.cpp \
        Source/WebCore/p2p/PeerConnection.h \
        Source/WebCore/p2p/SignalingCallback.h \
index 08361b64e46cc62d133d1dc9b882fabfd82889dd..28f15451178790782325365976c5d168f3756abf 100644 (file)
             'dom/Range.idl',
             'dom/RangeException.idl',
             'dom/RequestAnimationFrameCallback.idl',
-            'dom/StreamEvent.idl',
             'dom/StringCallback.idl',
             'dom/Text.idl',
             'dom/TextEvent.idl',
             'loader/appcache/DOMApplicationCache.idl',
             'notifications/Notification.idl',
             'notifications/NotificationCenter.idl',
+            'p2p/MediaStreamEvent.idl',
             'p2p/PeerConnection.idl',
             'p2p/SignalingCallback.idl',
             'page/AbstractView.idl',
             'notifications/NotificationCenter.cpp',
             'notifications/NotificationCenter.h',
             'notifications/NotificationContents.h',
+            'p2p/MediaStreamEvent.cpp',
+            'p2p/MediaStreamEvent.h',
             'p2p/PeerConnection.cpp',
             'p2p/PeerConnection.h',
             'p2p/SignalingCallback.h',
             'dom/StaticHashSetNodeList.h',
             'dom/StaticNodeList.cpp',
             'dom/StaticNodeList.h',
-            'dom/StreamEvent.cpp',
-            'dom/StreamEvent.h',
             'dom/StringCallback.cpp',
             'dom/StringCallback.h',
             'dom/StyleElement.cpp',
index a8e3b2b968c45425231e61dc14689e59d6d077ee..7a71fc63af8d8242a2bb0d2f0dd7583922999911 100644 (file)
@@ -3244,7 +3244,7 @@ contains(DEFINES, ENABLE_MEDIA_STREAM=1) {
         dom/MediaStreamList.h \
         dom/MediaStreamTrack.h \
         dom/MediaStreamTrackList.h \
-        dom/StreamEvent.h \
+        p2p/MediaStreamEvent.h \
         p2p/PeerConnection.h \
         p2p/SignalingCallback.h \
         page/CallbackTask.h \
@@ -3261,7 +3261,7 @@ contains(DEFINES, ENABLE_MEDIA_STREAM=1) {
         dom/MediaStreamList.cpp \
         dom/MediaStreamTrack.cpp \
         dom/MediaStreamTrackList.cpp \
-        dom/StreamEvent.cpp \
+        p2p/MediaStreamEvent.cpp \
         p2p/PeerConnection.cpp \
         page/MediaStreamController.cpp \
         page/MediaStreamFrameController.cpp
index d9c038c9810de1170e252caf2512c598335db75c..11faa33ffad958e15b80cbefd8feedd90b888b11 100755 (executable)
                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStream.h"
                                >
                        </File>
+                       <File
+                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamEvent.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug_Cairo_CFLite|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Cairo_CFLite|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug_All|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Production|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamEvent.h"
+                               >
+                       </File>
                        <File
                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSMediaStreamList.cpp"
                                >
                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoUsageCallback.h"
                                >
                        </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStreamEvent.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStreamEvent.h"
-                               >
-                       </File>
                        <File
                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStringCallback.cpp"
                                >
                <Filter
                        Name="p2p"
                        >
+                       <File
+                               RelativePath="..\p2p\MediaStreamEvent.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\p2p\MediaStreamEvent.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\p2p\PeerConnection.cpp"
                                >
                                RelativePath="..\dom\StaticNodeList.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\dom\StreamEvent.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\dom\StreamEvent.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\dom\StringCallback.cpp"
                                >
index 7fab86abf5ce88349d104c88dc29b512ef54d4f5..4c37ad4dfcee6dc588b26cbf78fcea8be2779ffa 100644 (file)
                499B3ED6128CD31400E726C2 /* GraphicsLayerCA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 499B3ED4128CD31400E726C2 /* GraphicsLayerCA.cpp */; };
                499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */; settings = {ATTRIBUTES = (Private, ); }; };
                499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               49A2CFD913E9787E00579F13 /* MediaStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A2CFD613E9787E00579F13 /* MediaStreamEvent.cpp */; };
+               49A2CFDA13E9787E00579F13 /* MediaStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A2CFD713E9787E00579F13 /* MediaStreamEvent.h */; };
+               49A2D39413E981A300579F13 /* JSMediaStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A2D39213E981A300579F13 /* JSMediaStreamEvent.cpp */; };
+               49A2D39513E981A300579F13 /* JSMediaStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A2D39313E981A300579F13 /* JSMediaStreamEvent.h */; };
                49A5A4FE13E2F01E00CFDAE0 /* PeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A5A4F813E2F01E00CFDAE0 /* PeerConnection.cpp */; };
                49A5A4FF13E2F01E00CFDAE0 /* PeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A5A4F913E2F01E00CFDAE0 /* PeerConnection.h */; };
                49A5A50113E2F01E00CFDAE0 /* SignalingCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A5A4FB13E2F01E00CFDAE0 /* SignalingCallback.h */; };
-               49A85B6B138D573A00ECB7B3 /* StreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A85B68138D573900ECB7B3 /* StreamEvent.cpp */; };
-               49A85B6C138D573A00ECB7B3 /* StreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A85B69138D573A00ECB7B3 /* StreamEvent.h */; };
-               49A85B77138D58EE00ECB7B3 /* JSStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */; };
-               49A85B78138D58EE00ECB7B3 /* JSStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */; };
                49BE30D213D9747B003808A9 /* JSPeerConnectionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BE30D113D9747B003808A9 /* JSPeerConnectionCustom.cpp */; };
                49BE30F313D97646003808A9 /* JSPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BE30EF13D97646003808A9 /* JSPeerConnection.cpp */; };
                49BE30F413D97646003808A9 /* JSPeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 49BE30F013D97646003808A9 /* JSPeerConnection.h */; };
                499B3ED4128CD31400E726C2 /* GraphicsLayerCA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GraphicsLayerCA.cpp; path = ca/GraphicsLayerCA.cpp; sourceTree = "<group>"; };
                499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsLayerCA.h; path = ca/GraphicsLayerCA.h; sourceTree = "<group>"; };
                499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAAnimation.h; path = ca/PlatformCAAnimation.h; sourceTree = "<group>"; };
+               49A2CFD613E9787E00579F13 /* MediaStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaStreamEvent.cpp; path = p2p/MediaStreamEvent.cpp; sourceTree = "<group>"; };
+               49A2CFD713E9787E00579F13 /* MediaStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaStreamEvent.h; path = p2p/MediaStreamEvent.h; sourceTree = "<group>"; };
+               49A2CFD813E9787E00579F13 /* MediaStreamEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MediaStreamEvent.idl; path = p2p/MediaStreamEvent.idl; sourceTree = "<group>"; };
+               49A2D39213E981A300579F13 /* JSMediaStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamEvent.cpp; sourceTree = "<group>"; };
+               49A2D39313E981A300579F13 /* JSMediaStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamEvent.h; sourceTree = "<group>"; };
                49A5A4F813E2F01E00CFDAE0 /* PeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PeerConnection.cpp; path = p2p/PeerConnection.cpp; sourceTree = "<group>"; };
                49A5A4F913E2F01E00CFDAE0 /* PeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeerConnection.h; path = p2p/PeerConnection.h; sourceTree = "<group>"; };
                49A5A4FA13E2F01E00CFDAE0 /* PeerConnection.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PeerConnection.idl; path = p2p/PeerConnection.idl; sourceTree = "<group>"; };
                49A5A4FB13E2F01E00CFDAE0 /* SignalingCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignalingCallback.h; path = p2p/SignalingCallback.h; sourceTree = "<group>"; };
                49A5A4FC13E2F01E00CFDAE0 /* SignalingCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SignalingCallback.idl; path = p2p/SignalingCallback.idl; sourceTree = "<group>"; };
-               49A85B68138D573900ECB7B3 /* StreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamEvent.cpp; sourceTree = "<group>"; };
-               49A85B69138D573A00ECB7B3 /* StreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamEvent.h; sourceTree = "<group>"; };
-               49A85B6A138D573A00ECB7B3 /* StreamEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = StreamEvent.idl; sourceTree = "<group>"; };
-               49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStreamEvent.cpp; sourceTree = "<group>"; };
-               49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStreamEvent.h; sourceTree = "<group>"; };
                49BE30D113D9747B003808A9 /* JSPeerConnectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPeerConnectionCustom.cpp; sourceTree = "<group>"; };
                49BE30EF13D97646003808A9 /* JSPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPeerConnection.cpp; sourceTree = "<group>"; };
                49BE30F013D97646003808A9 /* JSPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPeerConnection.h; sourceTree = "<group>"; };
                49A5A4F613E2EFE600CFDAE0 /* p2p */ = {
                        isa = PBXGroup;
                        children = (
+                               49A2CFD613E9787E00579F13 /* MediaStreamEvent.cpp */,
+                               49A2CFD713E9787E00579F13 /* MediaStreamEvent.h */,
+                               49A2CFD813E9787E00579F13 /* MediaStreamEvent.idl */,
                                49A5A4F813E2F01E00CFDAE0 /* PeerConnection.cpp */,
                                49A5A4F913E2F01E00CFDAE0 /* PeerConnection.h */,
                                49A5A4FA13E2F01E00CFDAE0 /* PeerConnection.idl */,
                                B1E545D013462B0B0092A545 /* JSLocalMediaStream.h */,
                                B1E545D713462B0B0092A545 /* JSMediaStream.cpp */,
                                B1E545D813462B0B0092A545 /* JSMediaStream.h */,
+                               49A2D39213E981A300579F13 /* JSMediaStreamEvent.cpp */,
+                               49A2D39313E981A300579F13 /* JSMediaStreamEvent.h */,
                                B14353F6138EA95B00D53276 /* JSMediaStreamList.cpp */,
                                B14353F7138EA95B00D53276 /* JSMediaStreamList.h */,
                                49C9F48A13D57D320052600A /* JSMediaStreamTrack.cpp */,
                                75415D52129AB2D2003AD669 /* JSSpeechInputResult.h */,
                                75415D53129AB2D2003AD669 /* JSSpeechInputResultList.cpp */,
                                75415D54129AB2D2003AD669 /* JSSpeechInputResultList.h */,
-                               49A85B75138D58EE00ECB7B3 /* JSStreamEvent.cpp */,
-                               49A85B76138D58EE00ECB7B3 /* JSStreamEvent.h */,
                                65DF31EF09D1CC60000BE325 /* JSText.cpp */,
                                65DF31F009D1CC60000BE325 /* JSText.h */,
                        );
                                066C772F0AB603FD00238CC4 /* RenderFileUploadControl.h */,
                                53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */,
                                53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */,
+                               508CCA4E13CF106B003151F3 /* RenderFlowThread.cpp */,
+                               508CCA4D13CF106B003151F3 /* RenderFlowThread.h */,
                                A871DECC0A1530C700B12A68 /* RenderFrame.cpp */,
                                A871DECB0A1530C700B12A68 /* RenderFrame.h */,
                                0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */,
                                A8CFF04C0A154F09000A4234 /* TableLayout.h */,
                                37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */,
                                BCA257141293C010007A263D /* VerticalPositionCache.h */,
-                               508CCA4D13CF106B003151F3 /* RenderFlowThread.h */,
-                               508CCA4E13CF106B003151F3 /* RenderFlowThread.cpp */,
                        );
                        path = rendering;
                        sourceTree = "<group>";
                                CEA3949B11D45CDA003094CF /* StaticHashSetNodeList.h */,
                                BC7FA62C0D1F0EFF00DB22A9 /* StaticNodeList.cpp */,
                                BC7FA62B0D1F0EFF00DB22A9 /* StaticNodeList.h */,
-                               49A85B68138D573900ECB7B3 /* StreamEvent.cpp */,
-                               49A85B69138D573A00ECB7B3 /* StreamEvent.h */,
-                               49A85B6A138D573A00ECB7B3 /* StreamEvent.idl */,
                                8102C5871325BB1100DDE67A /* StringCallback.cpp */,
                                81AC6C35131C57D30009A7E0 /* StringCallback.h */,
                                81AC6C34131C57C20009A7E0 /* StringCallback.idl */,
                                89878555122CA064003AABDA /* DirectoryReader.h in Headers */,
                                890AE0E11256A07900F5968C /* DirectoryReaderBase.h in Headers */,
                                893C48031248BD3A002B3D86 /* DirectoryReaderSync.h in Headers */,
+                               490C47CE13E82D1800F7AB82 /* DispatchTask.h in Headers */,
                                FD31609112B026F700C1A359 /* Distance.h in Headers */,
                                84730D771248F0B300D3A9C9 /* DistantLightSource.h in Headers */,
                                B2F34FE60E82F81400F627CD /* DNS.h in Headers */,
                                BC3C39B70C0D3D8D005F4D7A /* JSMediaList.h in Headers */,
                                D3A94A47122DC40F00A37BBC /* JSMediaQueryList.h in Headers */,
                                B1E545E613462B0B0092A545 /* JSMediaStream.h in Headers */,
+                               49A2D39513E981A300579F13 /* JSMediaStreamEvent.h in Headers */,
                                B14353F9138EA95B00D53276 /* JSMediaStreamList.h in Headers */,
                                49C9F48F13D57D320052600A /* JSMediaStreamTrack.h in Headers */,
                                49C9F49113D57D320052600A /* JSMediaStreamTrackList.h in Headers */,
                                892CF20C134C8BB300AAEDA1 /* JSStorageInfo.h in Headers */,
                                892CF20E134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h in Headers */,
                                892CF212134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h in Headers */,
-                               49A85B78138D58EE00ECB7B3 /* JSStreamEvent.h in Headers */,
                                0FF5026A102BA9430066F39A /* JSStyleMedia.h in Headers */,
                                BCE0139B0C0BEF180043860A /* JSStyleSheet.h in Headers */,
                                A84EBD830CB8C97700079609 /* JSStyleSheetList.h in Headers */,
                                93309DF8099E64920056E581 /* markup.h in Headers */,
                                9728C3141268E4390041E89B /* MarkupAccumulator.h in Headers */,
                                00A629C113D0BEC70050AC52 /* MarkupTokenBase.h in Headers */,
-                               00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h in Headers */,
                                00C60E4213D797AE0092A275 /* MarkupTokenizerBase.h in Headers */,
+                               00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlineMethods.h in Headers */,
                                FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */,
                                44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */,
                                FABE72F71059C1EB00D999DD /* MathMLInlineContainerElement.h in Headers */,
                                B1E5457E1346291F0092A545 /* MediaStream.h in Headers */,
                                B1E54594134629C10092A545 /* MediaStreamClient.h in Headers */,
                                B1E54598134629C10092A545 /* MediaStreamController.h in Headers */,
+                               49A2CFDA13E9787E00579F13 /* MediaStreamEvent.h in Headers */,
                                B1E54596134629C10092A545 /* MediaStreamFrameController.h in Headers */,
                                B14353D6138EA8ED00D53276 /* MediaStreamList.h in Headers */,
                                49C9F32613D574F90052600A /* MediaStreamTrack.h in Headers */,
                                FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
                                FD31603E12B0267600C1A359 /* RealtimeAnalyserNode.h in Headers */,
                                BC4368E80C226E32005EFB5F /* Rect.h in Headers */,
+                               BCAB418213E356E800D8AAF3 /* Region.h in Headers */,
                                85031B4C0A44EFC700F992E0 /* RegisteredEventListener.h in Headers */,
                                B2C3DA2D0D006C1D00EF6F26 /* RegularExpression.h in Headers */,
                                93309E01099E64920056E581 /* RemoveCSSPropertyCommand.h in Headers */,
                                A8EA73C40A1900E300A8EF5F /* RenderFieldset.h in Headers */,
                                066C77310AB603FD00238CC4 /* RenderFileUploadControl.h in Headers */,
                                53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */,
+                               508CCA4F13CF106B003151F3 /* RenderFlowThread.h in Headers */,
                                A871DED30A1530C700B12A68 /* RenderFrame.h in Headers */,
                                0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */,
                                A871DED10A1530C700B12A68 /* RenderFrameSet.h in Headers */,
                                A871DED70A1530C700B12A68 /* RenderPart.h in Headers */,
                                A43BF59D1149292800C643CA /* RenderProgress.h in Headers */,
                                5A574F25131DB93900471B88 /* RenderQuote.h in Headers */,
+                               D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */,
                                A871DFE30A15376B00B12A68 /* RenderReplaced.h in Headers */,
                                BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */,
                                1479FAEE109AE37500DED655 /* RenderRuby.h in Headers */,
                                498770E91242C535002226BA /* Shader.h in Headers */,
                                0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */,
                                A74C2D3C13811E0D00F83572 /* ShadowContentElement.h in Headers */,
-                               A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */,
                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
+                               A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */,
                                A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
                                A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */,
                                B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */,
                                C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
                                3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
                                3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */,
-                               49A85B6C138D573A00ECB7B3 /* StreamEvent.h in Headers */,
                                81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */,
                                65488D6B0DD5A83D009D83B2 /* StringSourceProvider.h in Headers */,
                                B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
                                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
-                               508CCA4F13CF106B003151F3 /* RenderFlowThread.h in Headers */,
-                               D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */,
-                               BCAB418213E356E800D8AAF3 /* Region.h in Headers */,
-                               490C47CE13E82D1800F7AB82 /* DispatchTask.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                1464E06C135EC10600FDB00A /* JSMediaListCustom.cpp in Sources */,
                                D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */,
                                B1E545E513462B0B0092A545 /* JSMediaStream.cpp in Sources */,
+                               49A2D39413E981A300579F13 /* JSMediaStreamEvent.cpp in Sources */,
                                B14353F8138EA95B00D53276 /* JSMediaStreamList.cpp in Sources */,
                                49C9F48E13D57D320052600A /* JSMediaStreamTrack.cpp in Sources */,
                                49C9F49013D57D320052600A /* JSMediaStreamTrackList.cpp in Sources */,
                                892CF20B134C8BB300AAEDA1 /* JSStorageInfo.cpp in Sources */,
                                892CF20D134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp in Sources */,
                                892CF211134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp in Sources */,
-                               49A85B77138D58EE00ECB7B3 /* JSStreamEvent.cpp in Sources */,
                                0FF50269102BA9430066F39A /* JSStyleMedia.cpp in Sources */,
                                BCE0139A0C0BEF180043860A /* JSStyleSheet.cpp in Sources */,
                                BC98A27D0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp in Sources */,
                                D3AA10F3123A98AA0092152B /* MediaQueryMatcher.cpp in Sources */,
                                B1E5457D1346291F0092A545 /* MediaStream.cpp in Sources */,
                                B1E54597134629C10092A545 /* MediaStreamController.cpp in Sources */,
+                               49A2CFD913E9787E00579F13 /* MediaStreamEvent.cpp in Sources */,
                                B1E54595134629C10092A545 /* MediaStreamFrameController.cpp in Sources */,
                                B14353D5138EA8ED00D53276 /* MediaStreamList.cpp in Sources */,
                                49C9F32713D574F90052600A /* MediaStreamTrack.cpp in Sources */,
                                F55B3DCD1251F12D003EF269 /* RangeInputType.cpp in Sources */,
                                FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */,
                                FD31603D12B0267600C1A359 /* RealtimeAnalyserNode.cpp in Sources */,
+                               BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */,
                                85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
                                B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */,
                                93309E00099E64920056E581 /* RemoveCSSPropertyCommand.cpp in Sources */,
                                A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */,
                                066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */,
                                53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */,
+                               508CCA5013CF106B003151F3 /* RenderFlowThread.cpp in Sources */,
                                A871DED40A1530C700B12A68 /* RenderFrame.cpp in Sources */,
                                0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
                                A871DED20A1530C700B12A68 /* RenderFrameSet.cpp in Sources */,
                                A871DED00A1530C700B12A68 /* RenderPart.cpp in Sources */,
                                A43BF59C1149292800C643CA /* RenderProgress.cpp in Sources */,
                                5A574F24131DB93900471B88 /* RenderQuote.cpp in Sources */,
+                               D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */,
                                A871DFE20A15376B00B12A68 /* RenderReplaced.cpp in Sources */,
                                BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */,
                                1479FAED109AE37500DED655 /* RenderRuby.cpp in Sources */,
                                498770E81242C535002226BA /* Shader.cpp in Sources */,
                                0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */,
                                A766CF8C13810E0C0011A0B3 /* ShadowContentElement.cpp in Sources */,
-                               A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */,
                                BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
+                               A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */,
                                A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
                                A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */,
                                B2AFFC930D00A5DF0030074D /* ShapeArabic.c in Sources */,
                                C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */,
                                C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */,
                                3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */,
-                               49A85B6B138D573A00ECB7B3 /* StreamEvent.cpp in Sources */,
                                B2C3DA300D006C1D00EF6F26 /* String.cpp in Sources */,
                                8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */,
                                B2B2645C0D00A77E000ACC1D /* StringCF.cpp in Sources */,
                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
-                               508CCA5013CF106B003151F3 /* RenderFlowThread.cpp in Sources */,
-                               D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */,
-                               BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 822bf948d83c7c8391a149746d90bfbb89db26b9..da62a67b2d73a28ca5b3edbba751538c36af5a98 100644 (file)
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-#include "JSStreamEvent.h"
-#include "StreamEvent.h"
+#include "JSMediaStreamEvent.h"
+#include "MediaStreamEvent.h"
 #endif
 
 using namespace JSC;
@@ -214,8 +214,8 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event)
         wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CloseEvent, event);
 #endif
 #if ENABLE(MEDIA_STREAM)
-    else if (event->isStreamEvent())
-        wrapper = CREATE_DOM_WRAPPER(exec, globalObject, StreamEvent, event);
+    else if (event->isMediaStreamEvent())
+        wrapper = CREATE_DOM_WRAPPER(exec, globalObject, MediaStreamEvent, event);
 #endif
     else
         wrapper = CREATE_DOM_WRAPPER(exec, globalObject, Event, event);
index 2c31e103f1e4cf521259c92efbbeda0571c92aed..ec3aae086aefd4274c1cc07a302bea42886156ed 100644 (file)
@@ -57,7 +57,6 @@
 #include "V8Proxy.h"
 #include "V8SpeechInputEvent.h"
 #include "V8StorageEvent.h"
-#include "V8StreamEvent.h"
 #include "V8TextEvent.h"
 #include "V8TouchEvent.h"
 #include "V8UIEvent.h"
 #include "V8OfflineAudioCompletionEvent.h"
 #endif
 
+#if ENABLE(MEDIA_STREAM)
+#include "V8MediaStreamEvent.h"
+#endif
+
 namespace WebCore {
 
 void V8Event::valueAccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
@@ -186,8 +189,8 @@ v8::Handle<v8::Value> toV8(Event* impl)
         return toV8(static_cast<CloseEvent*>(impl));
 #endif
 #if ENABLE(MEDIA_STREAM)
-    if (impl->isStreamEvent())
-        return toV8(static_cast<StreamEvent*>(impl));
+    if (impl->isMediaStreamEvent())
+        return toV8(static_cast<MediaStreamEvent*>(impl));
 #endif
     return V8Event::wrap(impl);
 }
index 3ad1566e673d27fb91209be66a4fd973197a6df7..b8b85d5859f594a7c2aa1b8e414a3bf4f5f51b38 100644 (file)
 #include "SpaceSplitString.cpp"
 #include "StaticHashSetNodeList.cpp"
 #include "StaticNodeList.cpp"
-#include "StreamEvent.cpp"
 #include "StyleElement.cpp"
 #include "StyledElement.cpp"
 #include "TagNodeList.cpp"
index 8882241ff6e4d034a9e2b4e54f007e3808de17f6..8db5a123aa965bbfaf5e5a69291ce817ee48847d 100644 (file)
@@ -251,7 +251,7 @@ bool Event::isCloseEvent() const
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-bool Event::isStreamEvent() const
+bool Event::isMediaStreamEvent() const
 {
     return false;
 }
index 98379d47449ff983992a45a6a8d4fa86130a55d4..42dc111ca77ba6c7355d4778be165dac499876be 100644 (file)
@@ -148,7 +148,7 @@ namespace WebCore {
         virtual bool isCloseEvent() const;
 #endif
 #if ENABLE(MEDIA_STREAM)
-        virtual bool isStreamEvent() const;
+        virtual bool isMediaStreamEvent() const;
 #endif
         bool propagationStopped() const { return m_propagationStopped || m_immediatePropagationStopped; }
         bool immediatePropagationStopped() const { return m_immediatePropagationStopped; }
similarity index 73%
rename from Source/WebCore/dom/StreamEvent.cpp
rename to Source/WebCore/p2p/MediaStreamEvent.cpp
index bedeb90794611eec5c91b6954139b82e642476e8..7c00212e4402c0beb5de8a041a7c92ab879fd8a1 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "StreamEvent.h"
+#include "MediaStreamEvent.h"
 
 #if ENABLE(MEDIA_STREAM)
 
 
 namespace WebCore {
 
-PassRefPtr<StreamEvent> StreamEvent::create()
+PassRefPtr<MediaStreamEvent> MediaStreamEvent::create()
 {
-    return adoptRef(new StreamEvent);
+    return adoptRef(new MediaStreamEvent);
 }
 
-PassRefPtr<StreamEvent> StreamEvent::create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)
+PassRefPtr<MediaStreamEvent> MediaStreamEvent::create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)
 {
-    return adoptRef(new StreamEvent(type, canBubble, cancelable, stream));
+    return adoptRef(new MediaStreamEvent(type, canBubble, cancelable, stream));
 }
 
 
-StreamEvent::StreamEvent()
+MediaStreamEvent::MediaStreamEvent()
 {
 }
 
-StreamEvent::StreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)
+MediaStreamEvent::MediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)
     : Event(type, canBubble, cancelable)
     , m_stream(stream)
 {
 }
 
-StreamEvent::~StreamEvent()
+MediaStreamEvent::~MediaStreamEvent()
 {
 }
 
-void StreamEvent::initStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)
+void MediaStreamEvent::initMediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream> stream)
 {
     if (dispatched())
         return;
@@ -67,7 +67,7 @@ void StreamEvent::initStreamEvent(const AtomicString& type, bool canBubble, bool
     m_stream = stream;
 }
 
-PassRefPtr<MediaStream> StreamEvent::stream() const
+PassRefPtr<MediaStream> MediaStreamEvent::stream() const
 {
     return m_stream;
 }
similarity index 74%
rename from Source/WebCore/dom/StreamEvent.h
rename to Source/WebCore/p2p/MediaStreamEvent.h
index bfabac68be85c7dda82000df50ba02980fb68845..e4e25f5e72bf4b3c9b6bbc7bb8d0b15d4d9c9157 100644 (file)
@@ -22,8 +22,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef StreamEvent_h
-#define StreamEvent_h
+#ifndef MediaStreamEvent_h
+#define MediaStreamEvent_h
 
 #if ENABLE(MEDIA_STREAM)
 
@@ -34,14 +34,14 @@ namespace WebCore {
 
 class Stream;
 
-class StreamEvent : public Event {
+class MediaStreamEvent : public Event {
 public:
-    virtual ~StreamEvent();
+    virtual ~MediaStreamEvent();
 
-    static PassRefPtr<StreamEvent> create();
-    static PassRefPtr<StreamEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
+    static PassRefPtr<MediaStreamEvent> create();
+    static PassRefPtr<MediaStreamEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
 
-    void initStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
+    void initMediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
 
     // From EventTarget.
     virtual bool isMediaStreamEvent() const { return true; }
@@ -49,8 +49,8 @@ public:
     PassRefPtr<MediaStream> stream() const;
 
 private:
-    StreamEvent();
-    StreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
+    MediaStreamEvent();
+    MediaStreamEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
 
     RefPtr<MediaStream> m_stream;
 };
@@ -59,4 +59,4 @@ private:
 
 #endif // ENABLE(MEDIA_STREAM)
 
-#endif // StreamEvent_h
+#endif // MediaStreamEvent_h
similarity index 74%
rename from Source/WebCore/dom/StreamEvent.idl
rename to Source/WebCore/p2p/MediaStreamEvent.idl
index ef7b28b95964301db54f337c789de4d3a761f097..315bb79a094fab62c6df2d3cf83b64fd1af15112 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-module events {
+module p2p {
 
-    // According to the WHATWG specification, section 9.7:
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#streamevent
+    // According to the WHATWG specification:
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/video-conferencing-and-peer-to-peer-communication.html#mediastreamevent
     interface [
         Conditional=MEDIA_STREAM,
-    ] StreamEvent : Event {
+    ] MediaStreamEvent : Event {
        readonly attribute MediaStream stream;
 
-       void initStreamEvent(in [Optional=CallWithDefaultValue] DOMString typeArg,
-                            in [Optional=CallWithDefaultValue] boolean canBubbleArg,
-                            in [Optional=CallWithDefaultValue] boolean cancelableArg,
-                            in [Optional=CallWithDefaultValue] MediaStream streamArg);
+       void initMediaStreamEvent(in [Optional=CallWithDefaultValue] DOMString typeArg,
+                                 in [Optional=CallWithDefaultValue] boolean canBubbleArg,
+                                 in [Optional=CallWithDefaultValue] boolean cancelableArg,
+                                 in [Optional=CallWithDefaultValue] MediaStream streamArg);
     };
 
 }
index 91ca8d190eaabe8b88d6d4e00e2a9b4be0cac109..bda3ee34e84033f1855352b3bc363193cfd2ed5c 100644 (file)
 #include "Event.h"
 #include "EventNames.h"
 #include "MediaStream.h"
+#include "MediaStreamEvent.h"
 #include "MediaStreamList.h"
 #include "MessageEvent.h"
 #include "ScriptExecutionContext.h"
 #include "SignalingCallback.h"
-#include "StreamEvent.h"
 
 namespace WebCore {
 
@@ -293,7 +293,7 @@ void PeerConnection::dispatchSignalingEvent(const String& message)
 void PeerConnection::dispatchStreamEvent(const String& name, PassRefPtr<MediaStream> stream)
 {
     RefPtr<MediaStream> s = stream;
-    dispatchEvent(StreamEvent::create(name, false, false, s));
+    dispatchEvent(MediaStreamEvent::create(name, false, false, s));
 }
 
 void PeerConnection::dispatchSimpleEvent(const String& eventName)