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

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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 21 matching lines...) Expand all
32 #include "public/platform/WebString.h" 32 #include "public/platform/WebString.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 namespace { 36 namespace {
37 37
38 class ExtraDataContainer : public MediaStreamComponent::ExtraData { 38 class ExtraDataContainer : public MediaStreamComponent::ExtraData {
39 public: 39 public:
40 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(std::move(extraData)) { } 40 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(std::move(extraData)) { }
41 41
42 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } 42 WebMediaStreamTrack::ExtraData* getExtraData() { return m_extraData.get(); }
43 43
44 private: 44 private:
45 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData; 45 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData;
46 }; 46 };
47 47
48 } // namespace 48 } // namespace
49 49
50 WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamCompon ent) 50 WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamCompon ent)
51 : m_private(mediaStreamComponent) 51 : m_private(mediaStreamComponent)
52 { 52 {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ASSERT(!m_private.isNull()); 95 ASSERT(!m_private.isNull());
96 return m_private->id(); 96 return m_private->id();
97 } 97 }
98 98
99 WebMediaStreamSource WebMediaStreamTrack::source() const 99 WebMediaStreamSource WebMediaStreamTrack::source() const
100 { 100 {
101 ASSERT(!m_private.isNull()); 101 ASSERT(!m_private.isNull());
102 return WebMediaStreamSource(m_private->source()); 102 return WebMediaStreamSource(m_private->source());
103 } 103 }
104 104
105 WebMediaStreamTrack::ExtraData* WebMediaStreamTrack::extraData() const 105 WebMediaStreamTrack::ExtraData* WebMediaStreamTrack::getExtraData() const
106 { 106 {
107 MediaStreamComponent::ExtraData* data = m_private->extraData(); 107 MediaStreamComponent::ExtraData* data = m_private->getExtraData();
108 if (!data) 108 if (!data)
109 return 0; 109 return 0;
110 return static_cast<ExtraDataContainer*>(data)->extraData(); 110 return static_cast<ExtraDataContainer*>(data)->getExtraData();
111 } 111 }
112 112
113 void WebMediaStreamTrack::setExtraData(ExtraData* extraData) 113 void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
114 { 114 {
115 ASSERT(!m_private.isNull()); 115 ASSERT(!m_private.isNull());
116 116
117 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)) )); 117 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)) ));
118 } 118 }
119 119
120 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider) 120 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
121 { ASSERT(!m_private.isNull()); 121 { ASSERT(!m_private.isNull());
122 m_private->setSourceProvider(provider); 122 m_private->setSourceProvider(provider);
123 } 123 }
124 124
125 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) 125 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
126 { 126 {
127 m_private = other.m_private; 127 m_private = other.m_private;
128 } 128 }
129 129
130 } // namespace blink 130 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698