Changeset 168842 in webkit


Ignore:
Timestamp:
May 14, 2014 9:59:12 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

alidation for getUserMedia() errorCallback is missing.
​https://bugs.webkit.org/show_bug.cgi?id=132901

Patch by Kiran <​kiran.guduru@samsung.com> on 2014-05-14
Reviewed by Darin Adler.

Source/WebCore:
The patch adds the validation for getUserMedia errorCallBack
and throws TypeMismatchError.

Test: fast/mediastream/getusermedia.html

  • Modules/mediastream/NavigatorUserMedia.cpp:

(WebCore::NavigatorUserMedia::webkitGetUserMedia):

LayoutTests:
This test checks for null values in getUserMedia errorCallback.

  • fast/mediastream/getusermedia.html:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r168840 r168842  
     12014-05-14  Kiran  <kiran.guduru@samsung.com>
     2
     3        alidation for getUserMedia() errorCallback is missing.
     4        https://bugs.webkit.org/show_bug.cgi?id=132901
     5
     6        Reviewed by Darin Adler.
     7
     8        This test checks for null values in getUserMedia errorCallback.
     9
     10        * fast/mediastream/getusermedia.html:
     11
    1122014-05-14  Alexey Proskuryakov  <ap@apple.com>
    213

  • trunk/LayoutTests/fast/mediastream/getusermedia.html

    r158987 r168842  
    3737                shouldBeEqualToString('errorArg.constraintName', 'valid_but_unsupported_1');
    3838
     39                shouldThrow("navigator.webkitGetUserMedia({audio:{mandatory:{'valid_and_supported_1':1}, optional:[{'valid_but_unsupported_1':0}]}, video:true}, gotStream5, 0);");
    3940                shouldNotThrow("navigator.webkitGetUserMedia({audio:{mandatory:{'valid_and_supported_1':1}, optional:[{'valid_but_unsupported_1':0}]}, video:true}, gotStream5, error);");
    4041            }
    … …  
    4647                shouldBe('stream.getVideoTracks().length', '1');
    4748
     49                shouldThrow("navigator.webkitGetUserMedia({audio:{mandatory:{'valid_but_unsupported_1':0}, optional:[]}, video:true}, gotStreamInError, null);");
    4850                shouldNotThrow("navigator.webkitGetUserMedia({audio:{mandatory:{'valid_but_unsupported_1':0}, optional:[]}, video:true}, gotStreamInError, error1);");
    4951            }
    … …  
    5557                shouldBe('stream.getVideoTracks().length', '1');
    5658
     59                shouldThrow("navigator.webkitGetUserMedia({audio:{mandatory:{}, optional:[]}, video:true}, gotStream4, null);");
    5760                shouldNotThrow("navigator.webkitGetUserMedia({audio:{mandatory:{}, optional:[]}, video:true}, gotStream4, error);");
    5861            }
    … …  
    6467                shouldBe('stream.getVideoTracks().length', '1');
    6568
     69                shouldThrow("navigator.webkitGetUserMedia({audio:true, video:true}, gotStream3, null);");
    6670                shouldNotThrow("navigator.webkitGetUserMedia({audio:true, video:true}, gotStream3, error);");
    6771            }
    … …  
    7377                shouldBe('stream.getVideoTracks().length', '0');
    7478
     79                shouldThrow("navigator.webkitGetUserMedia({video:true}, gotStream2, null);")
    7580                shouldNotThrow("navigator.webkitGetUserMedia({video:true}, gotStream2, error);")
    7681            }
    7782
    7883            shouldThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, error);")
     84            shouldThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, null);")
    7985            shouldNotThrow("navigator.webkitGetUserMedia({audio:true}, gotStream1, error);");
    8086

  • trunk/Source/WebCore/ChangeLog

    r168839 r168842  
     12014-05-14  Kiran  <kiran.guduru@samsung.com>
     2
     3        alidation for getUserMedia() errorCallback is missing.
     4        https://bugs.webkit.org/show_bug.cgi?id=132901
     5
     6        Reviewed by Darin Adler.
     7
     8        The patch adds the validation for getUserMedia errorCallBack
     9        and throws TypeMismatchError.
     10
     11        Test: fast/mediastream/getusermedia.html
     12
     13        * Modules/mediastream/NavigatorUserMedia.cpp:
     14        (WebCore::NavigatorUserMedia::webkitGetUserMedia):
     15
    1162014-05-14  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
    217

  • trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp

    r168576 r168842  
    4949void NavigatorUserMedia::webkitGetUserMedia(Navigator* navigator, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionCode& ec)
    5050{
    51     if (!successCallback)
     51    if (!successCallback || !errorCallback) {
     52        ec = TYPE_MISMATCH_ERR;
    5253        return;
     54    }
    5355
    5456    UserMediaController* userMedia = UserMediaController::from(navigator->frame() ? navigator->frame()->page() : 0);
Note: See TracChangeset for help on using the changeset viewer.