Index: third_party/WebKit/Source/platform/exported/WebMediaStream.cpp |
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp |
index 076ae239a726222b878673a96426a90ffb21d31e..468f919898e5eae51026ce97ce1ef3dbfc03112a 100644 |
--- a/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp |
+++ b/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp |
@@ -43,7 +43,7 @@ class ExtraDataContainer : public MediaStreamDescriptor::ExtraData { |
public: |
ExtraDataContainer(PassOwnPtr<WebMediaStream::ExtraData> extraData) : m_extraData(std::move(extraData)) { } |
- WebMediaStream::ExtraData* extraData() { return m_extraData.get(); } |
+ WebMediaStream::ExtraData* getExtraData() { return m_extraData.get(); } |
private: |
OwnPtr<WebMediaStream::ExtraData> m_extraData; |
@@ -66,12 +66,12 @@ WebString WebMediaStream::id() const |
return m_private->id(); |
} |
-WebMediaStream::ExtraData* WebMediaStream::extraData() const |
+WebMediaStream::ExtraData* WebMediaStream::getExtraData() const |
{ |
- MediaStreamDescriptor::ExtraData* data = m_private->extraData(); |
+ MediaStreamDescriptor::ExtraData* data = m_private->getExtraData(); |
if (!data) |
return 0; |
- return static_cast<ExtraDataContainer*>(data)->extraData(); |
+ return static_cast<ExtraDataContainer*>(data)->getExtraData(); |
} |
void WebMediaStream::setExtraData(ExtraData* extraData) |