Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp

Issue 2045193003: Make ready to unprefix getUserMedia, and counters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another counter renumbering Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Harri Porten (porten@kde.org) 2 * Copyright (C) 2000 Harri Porten (porten@kde.org)
3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org) 3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org) 4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 22 matching lines...) Expand all
33 #include "modules/mediastream/MediaDevicesRequest.h" 33 #include "modules/mediastream/MediaDevicesRequest.h"
34 #include "modules/mediastream/MediaErrorState.h" 34 #include "modules/mediastream/MediaErrorState.h"
35 #include "modules/mediastream/MediaStreamConstraints.h" 35 #include "modules/mediastream/MediaStreamConstraints.h"
36 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h" 36 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
37 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h" 37 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
38 #include "modules/mediastream/UserMediaController.h" 38 #include "modules/mediastream/UserMediaController.h"
39 #include "modules/mediastream/UserMediaRequest.h" 39 #include "modules/mediastream/UserMediaRequest.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const MediaS treamConstraints& options, NavigatorUserMediaSuccessCallback* successCallback, N avigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState) 43 void NavigatorMediaStream::getUserMedia(Navigator& navigator, const MediaStreamC onstraints& options, NavigatorUserMediaSuccessCallback* successCallback, Navigat orUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
44 { 44 {
45 if (!successCallback) 45 if (!successCallback)
46 return; 46 return;
47 47
48 UserMediaController* userMedia = UserMediaController::from(navigator.frame() ); 48 UserMediaController* userMedia = UserMediaController::from(navigator.frame() );
49 if (!userMedia) { 49 if (!userMedia) {
50 exceptionState.throwDOMException(NotSupportedError, "No user media contr oller available; is this a detached window?"); 50 exceptionState.throwDOMException(NotSupportedError, "No user media contr oller available; is this a detached window?");
51 return; 51 return;
52 } 52 }
53 53
(...skipping 12 matching lines...) Expand all
66 String errorMessage; 66 String errorMessage;
67 if (!request->isSecureContextUse(errorMessage)) { 67 if (!request->isSecureContextUse(errorMessage)) {
68 request->failPermissionDenied(errorMessage); 68 request->failPermissionDenied(errorMessage);
69 return; 69 return;
70 } 70 }
71 71
72 request->start(); 72 request->start();
73 } 73 }
74 74
75 } // namespace blink 75 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698