Source/modules/mediastream/UserMediaRequest.cpp - Issue 563703002: Oilpan: Enable oilpan for callback classes

Side by Side Diff: Source/modules/mediastream/UserMediaRequest.cpp

Issue 563703002: Oilpan: Enable oilpan for callback classes (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 2 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 | Annotate | Revision Log

« no previous file with comments | « Source/modules/mediastream/UserMediaRequest.h ('k') | Source/modules/notifications/Notification.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Ericsson AB. All rights reserved.	2 * Copyright (C) 2011 Ericsson AB. All rights reserved.

3 * Copyright (C) 2012 Google Inc. All rights reserved.	3 * Copyright (C) 2012 Google Inc. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 *	8 *

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 else {	58 else {

59 bool mediaRequested = false;	59 bool mediaRequested = false;

60 DictionaryHelper::get(options, mediaType, mediaRequested);	60 DictionaryHelper::get(options, mediaType, mediaRequested);

61 if (mediaRequested)	61 if (mediaRequested)

62 constraints = MediaConstraintsImpl::create();	62 constraints = MediaConstraintsImpl::create();

63 }	63 }

64	64

65 return constraints;	65 return constraints;

66 }	66 }

67	67

68 UserMediaRequest* UserMediaRequest::create(ExecutionContext* context, UserMediaC ontroller* controller, const Dictionary& options, PassOwnPtrWillBeRawPtr<Navigat orUserMediaSuccessCallback> successCallback, PassOwnPtrWillBeRawPtr<NavigatorUse rMediaErrorCallback> errorCallback, ExceptionState& exceptionState)	68 UserMediaRequest* UserMediaRequest::create(ExecutionContext* context, UserMediaC ontroller* controller, const Dictionary& options, NavigatorUserMediaSuccessCallb ack* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionS tate& exceptionState)

69 {	69 {

70 WebMediaConstraints audio = parseOptions(options, "audio", exceptionState);	70 WebMediaConstraints audio = parseOptions(options, "audio", exceptionState);

71 if (exceptionState.hadException())	71 if (exceptionState.hadException())

72 return nullptr;	72 return nullptr;

73	73

74 WebMediaConstraints video = parseOptions(options, "video", exceptionState);	74 WebMediaConstraints video = parseOptions(options, "video", exceptionState);

75 if (exceptionState.hadException())	75 if (exceptionState.hadException())

76 return nullptr;	76 return nullptr;

77	77

78 if (audio.isNull() && video.isNull()) {	78 if (audio.isNull() && video.isNull()) {

79 exceptionState.throwDOMException(SyntaxError, "At least one of audio and video must be requested");	79 exceptionState.throwDOMException(SyntaxError, "At least one of audio and video must be requested");

80 return nullptr;	80 return nullptr;

81 }	81 }

82	82

83 return new UserMediaRequest(context, controller, audio, video, successCallba ck, errorCallback);	83 return new UserMediaRequest(context, controller, audio, video, successCallba ck, errorCallback);

84 }	84 }

85	85

86 UserMediaRequest::UserMediaRequest(ExecutionContext* context, UserMediaControlle r* controller, WebMediaConstraints audio, WebMediaConstraints video, PassOwnPtrW illBeRawPtr<NavigatorUserMediaSuccessCallback> successCallback, PassOwnPtrWillBe RawPtr<NavigatorUserMediaErrorCallback> errorCallback)	86 UserMediaRequest::UserMediaRequest(ExecutionContext* context, UserMediaControlle r* controller, WebMediaConstraints audio, WebMediaConstraints video, NavigatorUs erMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorC allback)

87 : ContextLifecycleObserver(context)	87 : ContextLifecycleObserver(context)

88 , m_audio(audio)	88 , m_audio(audio)

89 , m_video(video)	89 , m_video(video)

90 , m_controller(controller)	90 , m_controller(controller)

91 , m_successCallback(successCallback)	91 , m_successCallback(successCallback)

92 , m_errorCallback(errorCallback)	92 , m_errorCallback(errorCallback)

93 {	93 {

94 }	94 }

95	95

96 UserMediaRequest::~UserMediaRequest()	96 UserMediaRequest::~UserMediaRequest()

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
185 ContextLifecycleObserver::contextDestroyed();	185 ContextLifecycleObserver::contextDestroyed();

186 }	186 }

187	187

188 void UserMediaRequest::trace(Visitor* visitor)	188 void UserMediaRequest::trace(Visitor* visitor)

189 {	189 {

190 visitor->trace(m_successCallback);	190 visitor->trace(m_successCallback);

191 visitor->trace(m_errorCallback);	191 visitor->trace(m_errorCallback);

192 }	192 }

193	193

194 } // namespace blink	194 } // namespace blink

OLD	NEW