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

Side by Side Diff: Source/platform/exported/WebMediaStreamTrack.cpp

Issue 458313005: Cleanup namespace usage from animation to exported in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Cleanup namespace usage from animation to exported in platform/ Created 6 years, 4 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 15 matching lines...) Expand all
26 26
27 #include "public/platform/WebMediaStreamTrack.h" 27 #include "public/platform/WebMediaStreamTrack.h"
28 28
29 #include "platform/mediastream/MediaStreamComponent.h" 29 #include "platform/mediastream/MediaStreamComponent.h"
30 #include "platform/mediastream/MediaStreamSource.h" 30 #include "platform/mediastream/MediaStreamSource.h"
31 #include "public/platform/WebAudioSourceProvider.h" 31 #include "public/platform/WebAudioSourceProvider.h"
32 #include "public/platform/WebMediaStream.h" 32 #include "public/platform/WebMediaStream.h"
33 #include "public/platform/WebMediaStreamSource.h" 33 #include "public/platform/WebMediaStreamSource.h"
34 #include "public/platform/WebString.h" 34 #include "public/platform/WebString.h"
35 35
36 using namespace blink;
37
38 namespace blink { 36 namespace blink {
39 37
40 namespace { 38 namespace {
41 39
42 class ExtraDataContainer : public MediaStreamComponent::ExtraData { 40 class ExtraDataContainer : public MediaStreamComponent::ExtraData {
43 public: 41 public:
44 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { } 42 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { }
45 43
46 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } 44 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); }
47 45
48 private: 46 private:
49 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData; 47 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData;
50 }; 48 };
51 49
52 } // namespace 50 } // namespace
53 51
54 WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner() 52 WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner()
55 { 53 {
56 ASSERT(m_owner); 54 ASSERT(m_owner);
57 return WebMediaStreamTrack(m_owner); 55 return WebMediaStreamTrack(m_owner);
58 } 56 }
59 57
60 void WebMediaStreamTrack::ExtraData::setOwner(blink::MediaStreamComponent* owner ) 58 void WebMediaStreamTrack::ExtraData::setOwner(MediaStreamComponent* owner)
61 { 59 {
62 ASSERT(!m_owner); 60 ASSERT(!m_owner);
63 m_owner = owner; 61 m_owner = owner;
64 } 62 }
65 63
66 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<blink::MediaStreamComponent> mediaStreamComponent) 64 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<MediaStreamComponent> mediaS treamComponent)
67 : m_private(mediaStreamComponent) 65 : m_private(mediaStreamComponent)
68 { 66 {
69 } 67 }
70 68
71 WebMediaStreamTrack::WebMediaStreamTrack(blink::MediaStreamComponent* mediaStrea mComponent) 69 WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamCompon ent)
72 : m_private(mediaStreamComponent) 70 : m_private(mediaStreamComponent)
73 { 71 {
74 } 72 }
75 73
76 WebMediaStreamTrack& WebMediaStreamTrack::operator=(blink::MediaStreamComponent* mediaStreamComponent) 74 WebMediaStreamTrack& WebMediaStreamTrack::operator=(MediaStreamComponent* mediaS treamComponent)
77 { 75 {
78 m_private = mediaStreamComponent; 76 m_private = mediaStreamComponent;
79 return *this; 77 return *this;
80 } 78 }
81 79
82 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source) 80 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source)
83 { 81 {
84 m_private = MediaStreamComponent::create(source); 82 m_private = MediaStreamComponent::create(source);
85 } 83 }
86 84
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 m_private->setSourceProvider(provider); 145 m_private->setSourceProvider(provider);
148 #endif // ENABLE(WEB_AUDIO) 146 #endif // ENABLE(WEB_AUDIO)
149 } 147 }
150 148
151 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) 149 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
152 { 150 {
153 m_private = other.m_private; 151 m_private = other.m_private;
154 } 152 }
155 153
156 } // namespace blink 154 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/exported/WebMediaStreamSource.cpp ('k') | Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698