| Index: third_party/WebKit/Source/platform/exported/WebMediaElementSource.cpp
|
| diff --git a/third_party/WebKit/Source/platform/exported/WebData.cpp b/third_party/WebKit/Source/platform/exported/WebMediaElementSource.cpp
|
| similarity index 65%
|
| copy from third_party/WebKit/Source/platform/exported/WebData.cpp
|
| copy to third_party/WebKit/Source/platform/exported/WebMediaElementSource.cpp
|
| index b29b83e6410a9f00c829a60e0169d2127fa21b7e..12c7de19482db49d47cb8f961038bf6cbb4a92f0 100644
|
| --- a/third_party/WebKit/Source/platform/exported/WebData.cpp
|
| +++ b/third_party/WebKit/Source/platform/exported/WebMediaElementSource.cpp
|
| @@ -28,55 +28,57 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "public/platform/WebData.h"
|
| -
|
| -#include "platform/SharedBuffer.h"
|
| +#include "public/platform/WebMediaElementSource.h"
|
|
|
| namespace blink {
|
|
|
| -void WebData::reset()
|
| +WebMediaElementSource::WebMediaElementSource()
|
| +{
|
| +}
|
| +
|
| +WebMediaElementSource::WebMediaElementSource(const WebURL& url)
|
| + : m_url(url)
|
| +{
|
| +}
|
| +
|
| +WebMediaElementSource::WebMediaElementSource(const WebMediaStream& mediaStream)
|
| + : m_mediaStream(mediaStream)
|
| {
|
| - m_private.reset();
|
| }
|
|
|
| -void WebData::assign(const WebData& other)
|
| +WebMediaElementSource::~WebMediaElementSource()
|
| {
|
| - m_private = other.m_private;
|
| + m_mediaStream.reset();
|
| }
|
|
|
| -void WebData::assign(const char* data, size_t size)
|
| +bool WebMediaElementSource::isEmpty() const
|
| {
|
| - m_private = SharedBuffer::create(data, size);
|
| + return !isURL() && !isMediaProviderObject();
|
| }
|
|
|
| -size_t WebData::size() const
|
| +bool WebMediaElementSource::isURL() const
|
| {
|
| - if (m_private.isNull())
|
| - return 0;
|
| - return m_private->size();
|
| + return !m_url.isEmpty();
|
| }
|
|
|
| -const char* WebData::data() const
|
| +WebURL WebMediaElementSource::getAsURL() const
|
| {
|
| - if (m_private.isNull())
|
| - return 0;
|
| - return m_private->data();
|
| + return m_url;
|
| }
|
|
|
| -WebData::WebData(const PassRefPtr<SharedBuffer>& buffer)
|
| - : m_private(buffer)
|
| +bool WebMediaElementSource::isMediaProviderObject() const
|
| {
|
| + return isMediaStream();
|
| }
|
|
|
| -WebData& WebData::operator=(const PassRefPtr<SharedBuffer>& buffer)
|
| +bool WebMediaElementSource::isMediaStream() const
|
| {
|
| - m_private = buffer;
|
| - return *this;
|
| + return !m_mediaStream.isNull();
|
| }
|
|
|
| -WebData::operator PassRefPtr<SharedBuffer>() const
|
| +WebMediaStream WebMediaElementSource::getAsMediaStream() const
|
| {
|
| - return PassRefPtr<SharedBuffer>(m_private.get());
|
| + return m_mediaStream;
|
| }
|
|
|
| } // namespace blink
|
|
|