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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "public/platform/WebMediaStreamTrackSourcesRequest.h" 26 #include "public/platform/WebMediaStreamTrackSourcesRequest.h"
27 27
28 #include "platform/mediastream/MediaStreamTrackSourcesRequest.h" 28 #include "platform/mediastream/MediaStreamTrackSourcesRequest.h"
29 #include "platform/weborigin/SecurityOrigin.h" 29 #include "platform/weborigin/SecurityOrigin.h"
30 #include "public/platform/WebSourceInfo.h" 30 #include "public/platform/WebSourceInfo.h"
31 #include "wtf/PassOwnPtr.h"
31 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 WebMediaStreamTrackSourcesRequest::WebMediaStreamTrackSourcesRequest(MediaStream TrackSourcesRequest* request) 36 WebMediaStreamTrackSourcesRequest::WebMediaStreamTrackSourcesRequest(MediaStream TrackSourcesRequest* request)
36 : m_private(request) 37 : m_private(request)
37 { 38 {
38 } 39 }
39 40
40 void WebMediaStreamTrackSourcesRequest::assign(const WebMediaStreamTrackSourcesR equest& other) 41 void WebMediaStreamTrackSourcesRequest::assign(const WebMediaStreamTrackSourcesR equest& other)
(...skipping 12 matching lines...) Expand all
53 return m_private->origin(); 54 return m_private->origin();
54 } 55 }
55 56
56 void WebMediaStreamTrackSourcesRequest::requestSucceeded(const WebVector<WebSour ceInfo>& sourceInfos) const 57 void WebMediaStreamTrackSourcesRequest::requestSucceeded(const WebVector<WebSour ceInfo>& sourceInfos) const
57 { 58 {
58 ASSERT(m_private.get()); 59 ASSERT(m_private.get());
59 m_private->requestSucceeded(sourceInfos); 60 m_private->requestSucceeded(sourceInfos);
60 } 61 }
61 62
62 } // namespace blink 63 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698