MediaStream API: Updating NavigatorUserMediaError

Source/testing/runner/WebUserMediaClientMock.cpp

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
 
 namespace WebTestRunner {
 
 class UserMediaRequestTask : public WebMethodTask<WebUserMediaClientMock> {
 public:
     UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebMediaStream result)
         : WebMethodTask<WebUserMediaClientMock>(object)
         , m_request(request)
         , m_result(result)
     {
+        WEBKIT_ASSERT(!m_result.isNull());
     }
 
     virtual void runIfValid() OVERRIDE
     {
-        if (m_result.isNull())
-            m_request.requestFailed();
-        else
-            m_request.requestSucceeded(m_result);
+        m_request.requestSucceeded(m_result);
     }
 
 private:
     WebUserMediaRequest m_request;
     WebMediaStream m_result;
 };
 
+class UserMediaRequestConstraintFailedTask : public WebMethodTask<WebUserMediaClientMock> {
+public:
+    UserMediaRequestConstraintFailedTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebString& constraint)
+        : WebMethodTask<WebUserMediaClientMock>(object)
+        , m_request(request)
+        , m_constraint(constraint)
+    {
+    }
+
+    virtual void runIfValid() OVERRIDE
+    {
+        m_request.requestFailedConstraint(m_constraint);
+    }
+
+private:
+    WebUserMediaRequest m_request;
+    WebString m_constraint;
+};
+
+class UserMediaRequestPermissionDeniedTask : public WebMethodTask<WebUserMediaClientMock> {
+public:
+    UserMediaRequestPermissionDeniedTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request)
+        : WebMethodTask<WebUserMediaClientMock>(object)
+        , m_request(request)
+    {
+    }
+
+    virtual void runIfValid() OVERRIDE
+    {
+        m_request.requestFailed();
+    }
+
+private:
+    WebUserMediaRequest m_request;
+};
+
 ////////////////////////////////
 
 class MockExtraData : public WebMediaStream::ExtraData {
 public:
     int foo;
 };
 
 WebUserMediaClientMock::WebUserMediaClientMock(WebTestDelegate* delegate)
     : m_delegate(delegate)
 {
 }
 
 void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamRequest)
 {
     WEBKIT_ASSERT(!streamRequest.isNull());
     WebUserMediaRequest request = streamRequest;
 
     if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
-        m_delegate->postTask(new UserMediaRequestTask(this, request, WebMediaStream()));
+        m_delegate->postTask(new UserMediaRequestPermissionDeniedTask(this, request));
         return;
     }
 
     WebMediaConstraints constraints = request.audioConstraints();
-    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
-        m_delegate->postTask(new UserMediaRequestTask(this, request, WebMediaStream()));
+    WebString failedConstraint;
+    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints, &failedConstraint)) {
+        m_delegate->postTask(new UserMediaRequestConstraintFailedTask(this, request, failedConstraint));
         return;
     }
     constraints = request.videoConstraints();
-    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
-        m_delegate->postTask(new UserMediaRequestTask(this, request, WebMediaStream()));
+    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints, &failedConstraint)) {
+        m_delegate->postTask(new UserMediaRequestConstraintFailedTask(this, request, failedConstraint));
         return;
     }
 
     const size_t zero = 0;
     const size_t one = 1;
     WebVector<WebMediaStreamTrack> audioTracks(request.audio() ? one : zero);
     WebVector<WebMediaStreamTrack> videoTracks(request.video() ? one : zero);
 
     if (request.audio()) {
         WebMediaStreamSource source;
@@ skipping 13 matching lines @@
     stream.setExtraData(new MockExtraData());
 
     m_delegate->postTask(new UserMediaRequestTask(this, request, stream));
 }
 
 void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&)
 {
 }
 
 }