| Index: Source/WebKit/chromium/src/WebDOMResourceProgressEvent.cpp
|
| diff --git a/Source/WebKit/chromium/src/WebMediaSourceImpl.cpp b/Source/WebKit/chromium/src/WebDOMResourceProgressEvent.cpp
|
| similarity index 77%
|
| copy from Source/WebKit/chromium/src/WebMediaSourceImpl.cpp
|
| copy to Source/WebKit/chromium/src/WebDOMResourceProgressEvent.cpp
|
| index 4f96224e51a4b6434d671bab4fd5701e18d3c60d..788d3c60ab3494a7217546c92f1bec9ebaed7b39 100644
|
| --- a/Source/WebKit/chromium/src/WebMediaSourceImpl.cpp
|
| +++ b/Source/WebKit/chromium/src/WebDOMResourceProgressEvent.cpp
|
| @@ -29,28 +29,19 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "WebMediaSourceImpl.h"
|
| +#include "WebDOMResourceProgressEvent.h"
|
|
|
| -#include "MediaSourcePrivateImpl.h"
|
| -#include "WebMediaSourceClient.h"
|
| +#include "core/dom/ResourceProgressEvent.h"
|
| +#include <public/WebString.h>
|
|
|
| -namespace WebKit {
|
| -
|
| -
|
| -WebMediaSourceImpl::WebMediaSourceImpl(PassRefPtr<WebCore::WebKitMediaSource> mediaSource)
|
| -{
|
| - m_mediaSource = mediaSource;
|
| -}
|
| -
|
| -WebMediaSourceImpl::~WebMediaSourceImpl()
|
| -{
|
| -}
|
| +using namespace WebCore;
|
|
|
| +namespace WebKit {
|
|
|
| -void WebMediaSourceImpl::open(WebMediaSourceClient* client)
|
| +WebDOMResourceProgressEvent::WebDOMResourceProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total, const WebString& url)
|
| + : WebDOMProgressEvent()
|
| {
|
| - ASSERT(client);
|
| - m_mediaSource->setPrivateAndOpen(adoptPtr(new MediaSourcePrivateImpl(adoptPtr(client))));
|
| + assign(ResourceProgressEvent::create(type, lengthIsComputable, loaded, total, url));
|
| }
|
|
|
| -}
|
| +} // namespace WebKit
|
|
|