Diff
Modified: trunk/Source/WebCore/ChangeLog (100736 => 100737)
--- trunk/Source/WebCore/ChangeLog 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/ChangeLog 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,3 +1,27 @@
+2011-11-18 Adam Barth <aba...@webkit.org>
+
+ Move some mediastream related files into the mediastream directory
+ https://bugs.webkit.org/show_bug.cgi?id=72695
+
+ Reviewed by Eric Seidel.
+
+ Just moving the files to the proper directory.
+
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * mediastream/NavigatorUserMediaError.h: Renamed from Source/WebCore/page/NavigatorUserMediaError.h.
+ (WebCore::NavigatorUserMediaError::create):
+ (WebCore::NavigatorUserMediaError::~NavigatorUserMediaError):
+ (WebCore::NavigatorUserMediaError::code):
+ (WebCore::NavigatorUserMediaError::NavigatorUserMediaError):
+ * mediastream/NavigatorUserMediaError.idl: Renamed from Source/WebCore/page/NavigatorUserMediaError.idl.
+ * mediastream/NavigatorUserMediaErrorCallback.h: Renamed from Source/WebCore/page/NavigatorUserMediaErrorCallback.h.
+ (WebCore::NavigatorUserMediaErrorCallback::~NavigatorUserMediaErrorCallback):
+ * mediastream/NavigatorUserMediaErrorCallback.idl: Renamed from Source/WebCore/page/NavigatorUserMediaErrorCallback.idl.
+ * mediastream/NavigatorUserMediaSuccessCallback.h: Renamed from Source/WebCore/page/NavigatorUserMediaSuccessCallback.h.
+ (WebCore::NavigatorUserMediaSuccessCallback::~NavigatorUserMediaSuccessCallback):
+ * mediastream/NavigatorUserMediaSuccessCallback.idl: Renamed from Source/WebCore/page/NavigatorUserMediaSuccessCallback.idl.
+
2011-11-18 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: [Extensions API] Provide a way for extension to create a status bar icon
Modified: trunk/Source/WebCore/GNUmakefile.list.am (100736 => 100737)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-11-18 10:37:16 UTC (rev 100737)
@@ -2288,6 +2288,9 @@
Source/WebCore/mediastream/MediaStreamTrack.h \
Source/WebCore/mediastream/MediaStreamTrackList.cpp \
Source/WebCore/mediastream/MediaStreamTrackList.h \
+ Source/WebCore/mediastream/NavigatorUserMediaError.h \
+ Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.h \
+ Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.h \
Source/WebCore/mediastream/PeerConnection.cpp \
Source/WebCore/mediastream/PeerConnection.h \
Source/WebCore/mediastream/SignalingCallback.h \
@@ -2381,9 +2384,6 @@
Source/WebCore/page/Navigator.h \
Source/WebCore/page/NavigatorBase.cpp \
Source/WebCore/page/NavigatorBase.h \
- Source/WebCore/page/NavigatorUserMediaError.h \
- Source/WebCore/page/NavigatorUserMediaErrorCallback.h \
- Source/WebCore/page/NavigatorUserMediaSuccessCallback.h \
Source/WebCore/page/OriginAccessEntry.cpp \
Source/WebCore/page/OriginAccessEntry.h \
Source/WebCore/page/Page.cpp \
Modified: trunk/Source/WebCore/WebCore.gypi (100736 => 100737)
--- trunk/Source/WebCore/WebCore.gypi 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/WebCore.gypi 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1387,6 +1387,9 @@
'mediastream/MediaStreamList.idl',
'mediastream/MediaStreamTrack.idl',
'mediastream/MediaStreamTrackList.idl',
+ 'mediastream/NavigatorUserMediaError.idl',
+ 'mediastream/NavigatorUserMediaErrorCallback.idl',
+ 'mediastream/NavigatorUserMediaSuccessCallback.idl',
'mediastream/PeerConnection.idl',
'mediastream/SignalingCallback.idl',
'notifications/Notification.idl',
@@ -1405,9 +1408,6 @@
'page/Location.idl',
'page/MemoryInfo.idl',
'page/Navigator.idl',
- 'page/NavigatorUserMediaError.idl',
- 'page/NavigatorUserMediaErrorCallback.idl',
- 'page/NavigatorUserMediaSuccessCallback.idl',
'page/Performance.idl',
'page/PerformanceNavigation.idl',
'page/PerformanceTiming.idl',
@@ -2905,12 +2905,15 @@
'mediastream/MediaStreamEvent.h',
'mediastream/MediaStreamList.cpp',
'mediastream/MediaStreamList.h',
+ 'mediastream/MediaStreamRegistry.cpp',
+ 'mediastream/MediaStreamRegistry.h',
'mediastream/MediaStreamTrack.cpp',
'mediastream/MediaStreamTrack.h',
'mediastream/MediaStreamTrackList.cpp',
'mediastream/MediaStreamTrackList.h',
- 'mediastream/MediaStreamRegistry.cpp',
- 'mediastream/MediaStreamRegistry.h',
+ 'mediastream/NavigatorUserMediaError.h',
+ 'mediastream/NavigatorUserMediaErrorCallback.h',
+ 'mediastream/NavigatorUserMediaSuccessCallback.h',
'mediastream/PeerConnection.cpp',
'mediastream/PeerConnection.h',
'mediastream/SignalingCallback.h',
@@ -2960,9 +2963,6 @@
'page/Navigator.h',
'page/NavigatorBase.cpp',
'page/NavigatorBase.h',
- 'page/NavigatorUserMediaError.h',
- 'page/NavigatorUserMediaErrorCallback.h',
- 'page/NavigatorUserMediaSuccessCallback.h',
'page/OriginAccessEntry.cpp',
'page/OriginAccessEntry.h',
'page/Page.cpp',
Copied: trunk/Source/WebCore/mediastream/NavigatorUserMediaError.h (from rev 100736, trunk/Source/WebCore/page/NavigatorUserMediaError.h) (0 => 100737)
--- trunk/Source/WebCore/mediastream/NavigatorUserMediaError.h (rev 0)
+++ trunk/Source/WebCore/mediastream/NavigatorUserMediaError.h 2011-11-18 10:37:16 UTC (rev 100737)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NavigatorUserMediaError_h
+#define NavigatorUserMediaError_h
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+
+#if ENABLE(MEDIA_STREAM)
+
+namespace WebCore {
+
+class NavigatorUserMediaError : public RefCounted<NavigatorUserMediaError> {
+public:
+ // Should be kept in sync with the values in the idl file.
+ enum ErrorCode {
+ PERMISSION_DENIED = 1
+ };
+
+ static PassRefPtr<NavigatorUserMediaError> create(ErrorCode code)
+ {
+ return adoptRef(new NavigatorUserMediaError(code));
+ }
+
+ virtual ~NavigatorUserMediaError() { }
+
+ ErrorCode code() const { return m_code; }
+
+private:
+ NavigatorUserMediaError(ErrorCode code) : m_code(code) { }
+
+ ErrorCode m_code;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // NavigatorUserMediaError_h
Copied: trunk/Source/WebCore/mediastream/NavigatorUserMediaError.idl (from rev 100736, trunk/Source/WebCore/page/NavigatorUserMediaError.idl) (0 => 100737)
--- trunk/Source/WebCore/mediastream/NavigatorUserMediaError.idl (rev 0)
+++ trunk/Source/WebCore/mediastream/NavigatorUserMediaError.idl 2011-11-18 10:37:16 UTC (rev 100737)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module window {
+ interface [
+ Conditional=MEDIA_STREAM
+ ] NavigatorUserMediaError {
+ const unsigned short PERMISSION_DENIED = 1;
+ readonly attribute unsigned short code;
+ };
+
+}
+
Copied: trunk/Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.h (from rev 100736, trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.h) (0 => 100737)
--- trunk/Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.h (rev 0)
+++ trunk/Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.h 2011-11-18 10:37:16 UTC (rev 100737)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NavigatorUserMediaErrorCallback_h
+#define NavigatorUserMediaErrorCallback_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "NavigatorUserMediaError.h"
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class NavigatorUserMediaErrorCallback : public RefCounted<NavigatorUserMediaErrorCallback> {
+public:
+ virtual ~NavigatorUserMediaErrorCallback() { }
+ virtual bool handleEvent(NavigatorUserMediaError*) = 0;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // NavigatorUserMediaErrorCallback_h
Copied: trunk/Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.idl (from rev 100736, trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.idl) (0 => 100737)
--- trunk/Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.idl (rev 0)
+++ trunk/Source/WebCore/mediastream/NavigatorUserMediaErrorCallback.idl 2011-11-18 10:37:16 UTC (rev 100737)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module window {
+ interface [
+ Conditional=MEDIA_STREAM,
+ Callback=FunctionOnly
+ ] NavigatorUserMediaErrorCallback {
+ boolean handleEvent(in NavigatorUserMediaError error);
+ };
+
+}
Copied: trunk/Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.h (from rev 100736, trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.h) (0 => 100737)
--- trunk/Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.h (rev 0)
+++ trunk/Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.h 2011-11-18 10:37:16 UTC (rev 100737)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NavigatorUserMediaSuccessCallback_h
+#define NavigatorUserMediaSuccessCallback_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class LocalMediaStream;
+
+class NavigatorUserMediaSuccessCallback : public RefCounted<NavigatorUserMediaSuccessCallback> {
+public:
+ virtual ~NavigatorUserMediaSuccessCallback() { }
+ virtual bool handleEvent(LocalMediaStream*) = 0;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // NavigatorUserMediaSuccessCallback_h
Copied: trunk/Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.idl (from rev 100736, trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.idl) (0 => 100737)
--- trunk/Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.idl (rev 0)
+++ trunk/Source/WebCore/mediastream/NavigatorUserMediaSuccessCallback.idl 2011-11-18 10:37:16 UTC (rev 100737)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module window {
+ interface [
+ Conditional=MEDIA_STREAM,
+ Callback=FunctionOnly
+ ] NavigatorUserMediaSuccessCallback {
+ boolean handleEvent(in LocalMediaStream stream);
+ };
+
+}
Deleted: trunk/Source/WebCore/page/NavigatorUserMediaError.h (100736 => 100737)
--- trunk/Source/WebCore/page/NavigatorUserMediaError.h 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/page/NavigatorUserMediaError.h 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef NavigatorUserMediaError_h
-#define NavigatorUserMediaError_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-#if ENABLE(MEDIA_STREAM)
-
-namespace WebCore {
-
-class NavigatorUserMediaError : public RefCounted<NavigatorUserMediaError> {
-public:
- // Should be kept in sync with the values in the idl file.
- enum ErrorCode {
- PERMISSION_DENIED = 1
- };
-
- static PassRefPtr<NavigatorUserMediaError> create(ErrorCode code)
- {
- return adoptRef(new NavigatorUserMediaError(code));
- }
-
- virtual ~NavigatorUserMediaError() { }
-
- ErrorCode code() const { return m_code; }
-
-private:
- NavigatorUserMediaError(ErrorCode code) : m_code(code) { }
-
- ErrorCode m_code;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // NavigatorUserMediaError_h
Deleted: trunk/Source/WebCore/page/NavigatorUserMediaError.idl (100736 => 100737)
--- trunk/Source/WebCore/page/NavigatorUserMediaError.idl 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/page/NavigatorUserMediaError.idl 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module window {
- interface [
- Conditional=MEDIA_STREAM
- ] NavigatorUserMediaError {
- const unsigned short PERMISSION_DENIED = 1;
- readonly attribute unsigned short code;
- };
-
-}
-
Deleted: trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.h (100736 => 100737)
--- trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.h 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.h 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef NavigatorUserMediaErrorCallback_h
-#define NavigatorUserMediaErrorCallback_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "NavigatorUserMediaError.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class NavigatorUserMediaErrorCallback : public RefCounted<NavigatorUserMediaErrorCallback> {
-public:
- virtual ~NavigatorUserMediaErrorCallback() { }
- virtual bool handleEvent(NavigatorUserMediaError*) = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // NavigatorUserMediaErrorCallback_h
Deleted: trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.idl (100736 => 100737)
--- trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.idl 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/page/NavigatorUserMediaErrorCallback.idl 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module window {
- interface [
- Conditional=MEDIA_STREAM,
- Callback=FunctionOnly
- ] NavigatorUserMediaErrorCallback {
- boolean handleEvent(in NavigatorUserMediaError error);
- };
-
-}
Deleted: trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.h (100736 => 100737)
--- trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.h 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.h 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef NavigatorUserMediaSuccessCallback_h
-#define NavigatorUserMediaSuccessCallback_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class LocalMediaStream;
-
-class NavigatorUserMediaSuccessCallback : public RefCounted<NavigatorUserMediaSuccessCallback> {
-public:
- virtual ~NavigatorUserMediaSuccessCallback() { }
- virtual bool handleEvent(LocalMediaStream*) = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // NavigatorUserMediaSuccessCallback_h
Deleted: trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.idl (100736 => 100737)
--- trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.idl 2011-11-18 10:27:25 UTC (rev 100736)
+++ trunk/Source/WebCore/page/NavigatorUserMediaSuccessCallback.idl 2011-11-18 10:37:16 UTC (rev 100737)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module window {
- interface [
- Conditional=MEDIA_STREAM,
- Callback=FunctionOnly
- ] NavigatorUserMediaSuccessCallback {
- boolean handleEvent(in LocalMediaStream stream);
- };
-
-}
