Move MediaStream related declarations from DOMWindow to DOMWindowMediaStream

https://bugs.webkit.org/show_bug.cgi?id=79343

Reviewed by Eric Seidel.

These declarations belong in the MEDIA_STREAM module.

* GNUmakefile.list.am:
* WebCore.gypi:
* mediastream/DOMWindowMediaStream.idl: Added.
* page/DOMWindow.idl:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 57d468d..c38f73d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-23  Adam Barth  <abarth@webkit.org>
+
+        Move MediaStream related declarations from DOMWindow to DOMWindowMediaStream
+        https://bugs.webkit.org/show_bug.cgi?id=79343
+
+        Reviewed by Eric Seidel.
+
+        These declarations belong in the MEDIA_STREAM module.
+
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * mediastream/DOMWindowMediaStream.idl: Added.
+        * page/DOMWindow.idl:
+
 2012-02-22  Igor Oliveira  <igor.o@sisa.samsung.com>
 
         Every call to RenderObject::setAnimatableStyle() iterates through all m_compositeAnimations: potentially O(N^2)

diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index 974da1e..faa44e3 100644 (file)
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -882,6 +882,7 @@ dom_binding_idls += \
        $(WebCore)/inspector/ScriptProfile.idl \
        $(WebCore)/inspector/ScriptProfileNode.idl \
        $(WebCore)/loader/appcache/DOMApplicationCache.idl \
+       $(WebCore)/mediastream/DOMWindowMediaStream.idl \
        $(WebCore)/mediastream/LocalMediaStream.idl \
        $(WebCore)/mediastream/MediaStream.idl \
        $(WebCore)/mediastream/MediaStreamEvent.idl \

diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index fdc60e4..e8fe0c6 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -990,6 +990,7 @@
             'inspector/ScriptProfile.idl',
             'inspector/ScriptProfileNode.idl',
             'loader/appcache/DOMApplicationCache.idl',
+            'mediastream/DOMWindowMediaStream.idl',
             'mediastream/LocalMediaStream.idl',
             'mediastream/MediaStream.idl',
             'mediastream/MediaStreamEvent.idl',

diff --git a/Source/WebCore/mediastream/DOMWindowMediaStream.idl b/Source/WebCore/mediastream/DOMWindowMediaStream.idl
new file mode 100644 (file)
index 0000000..589878a
--- /dev/null
+++ b/Source/WebCore/mediastream/DOMWindowMediaStream.idl
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+module window {
+
+    interface [
+        Conditional=MEDIA_STREAM,
+        Supplemental=DOMWindow
+    ] DOMWindowMediaStream {
+        attribute [V8EnabledAtRuntime] PeerConnectionConstructor webkitPeerConnection;
+        attribute MediaStreamEventConstructor MediaStreamEvent;
+    };
+
+}

diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
index 4b897fb..c4587a0 100644 (file)
--- a/Source/WebCore/page/DOMWindow.idl
+++ b/Source/WebCore/page/DOMWindow.idl
@@ -317,8 +317,6 @@ module window {
         attribute [Conditional=DEVICE_ORIENTATION,V8EnabledAtRuntime] EventListener ondevicemotion;
         attribute [Conditional=DEVICE_ORIENTATION,V8EnabledAtRuntime] EventListener ondeviceorientation;
 
-        attribute [Conditional=MEDIA_STREAM,V8EnabledAtRuntime] PeerConnectionConstructor webkitPeerConnection;
-
         // EventTarget interface
         [Custom] void addEventListener(in DOMString type,
                                       in EventListener listener,
@@ -527,7 +525,6 @@ module window {
         attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent;
         attribute StorageEventConstructor StorageEvent;
         attribute [Conditional=INPUT_SPEECH] SpeechInputEventConstructor SpeechInputEvent;
-        attribute [Conditional=MEDIA_STREAM] MediaStreamEventConstructor MediaStreamEvent;
         attribute [Conditional=WEBGL] WebGLContextEventConstructor WebGLContextEvent;
 
         attribute EventExceptionConstructor EventException;