Changeset 155579 in webkit

Timestamp:

Sep 11, 2013 4:46:44 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream API] Updating NavigatorUserMediaError to match the spec
​https://bugs.webkit.org/show_bug.cgi?id=120880

Reviewed by Darin Adler.

Merge ​https://chromium.googlesource.com/chromium/blink/+/f07305e49ddebaa166f5dee514bcc881a8efd341
by Tommy Widenflycht.

The Blink change did not have any test changes because they don't appear to have any tests
for NavigatorUserMediaError. I can't add tests now because the MediaStream feature isn't enabled
yet, so ​https://bugs.webkit.org/show_bug.cgi?id=121182 tracks adding tests.

• Modules/mediastream/NavigatorUserMediaError.h:

(WebCore::NavigatorUserMediaError::create):
(WebCore::NavigatorUserMediaError::name):
(WebCore::NavigatorUserMediaError::message):
(WebCore::NavigatorUserMediaError::constraintName):
(WebCore::NavigatorUserMediaError::NavigatorUserMediaError):

• Modules/mediastream/NavigatorUserMediaError.idl:
• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::fail):
(WebCore::UserMediaRequest::failConstraint):

• Modules/mediastream/UserMediaRequest.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/NavigatorUserMediaError.h (modified) (1 diff)
• Modules/mediastream/NavigatorUserMediaError.idl (modified) (1 diff)
• Modules/mediastream/UserMediaRequest.cpp (modified) (1 diff)
• Modules/mediastream/UserMediaRequest.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-11  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream API] Updating NavigatorUserMediaError to match the spec
+        https://bugs.webkit.org/show_bug.cgi?id=120880
+
+        Reviewed by Darin Adler.
+        
+        Merge https://chromium.googlesource.com/chromium/blink/+/f07305e49ddebaa166f5dee514bcc881a8efd341
+        by Tommy Widenflycht.
+
+        The Blink change did not have any test changes because they don't appear to have any tests 
+        for NavigatorUserMediaError. I can't add tests now because the MediaStream feature isn't enabled 
+        yet, so https://bugs.webkit.org/show_bug.cgi?id=121182 tracks adding tests.
+
+        * Modules/mediastream/NavigatorUserMediaError.h:
+        (WebCore::NavigatorUserMediaError::create):
+        (WebCore::NavigatorUserMediaError::name):
+        (WebCore::NavigatorUserMediaError::message):
+        (WebCore::NavigatorUserMediaError::constraintName):
+        (WebCore::NavigatorUserMediaError::NavigatorUserMediaError):
+        * Modules/mediastream/NavigatorUserMediaError.idl:
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::fail):
+        (WebCore::UserMediaRequest::failConstraint):
+        * Modules/mediastream/UserMediaRequest.h:
+
 2013-09-11  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.h

@@ -35 +35 @@
 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)
+    static PassRefPtr<NavigatorUserMediaError> create(const String& name, const String& message, const String& constraintName)
     {
-        return adoptRef(new NavigatorUserMediaError(code));
+        return adoptRef(new NavigatorUserMediaError(name, message, constraintName));
     }
 
     virtual ~NavigatorUserMediaError() { }
 
-    ErrorCode code() const { return m_code; }
+    const String& name() const { return m_name; }
+    const String& message() const { return m_message; }
+    const String& constraintName() const { return m_constraintName; }
 
 private:
-    explicit NavigatorUserMediaError(ErrorCode code) : m_code(code) { }
+    NavigatorUserMediaError(const String& name, const String& message, const String& constraintName)
+        : m_name(name)
+        , m_message(message)
+        , m_constraintName(constraintName)
+    {
+    }
 
-    ErrorCode m_code;
+    String m_name;
+    String m_message;
+    String m_constraintName;
 };
 

trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.idl

@@ -27 +27 @@
     Conditional=MEDIA_STREAM
 ] interface NavigatorUserMediaError {
-    const unsigned short PERMISSION_DENIED = 1;
-    readonly attribute unsigned short code;
+    readonly attribute DOMString name;
+    readonly attribute DOMString message;
+    readonly attribute DOMString constraintName;
 };
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@ -145 +145 @@
 }
 
-void UserMediaRequest::fail()
+void UserMediaRequest::fail(const String& description)
 {
     if (!m_scriptExecutionContext)
         return;
 
-    if (m_errorCallback) {
-        RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::PERMISSION_DENIED);
-        m_errorCallback->handleEvent(error.get());
-    }
+    if (m_errorCallback)
+        m_errorCallback->handleEvent(NavigatorUserMediaError::create(ASCIILiteral("PERMISSION_DENIED"), description, String()).get());
+}
+
+void UserMediaRequest::failConstraint(const String& constraintName, const String& description)
+{
+    ASSERT(!constraintName.isEmpty());
+    if (!m_scriptExecutionContext)
+        return;
+    
+    if (m_errorCallback)
+        m_errorCallback->handleEvent(NavigatorUserMediaError::create(ASCIILiteral("CONSTRAINT_NOT_SATISFIED"), description, constraintName).get());
 }
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h

@@ -65 +65 @@
 
     void succeed(PassRefPtr<MediaStreamDescriptor>);
-    void fail();
+    void fail(const String& description);
+    void failConstraint(const String& constraintName, const String& description);
 
     MediaConstraints* audioConstraints() const;