| Index: Source/web/WorkerPermissionClient.cpp
|
| diff --git a/Source/web/InbandTextTrackPrivateImpl.cpp b/Source/web/WorkerPermissionClient.cpp
|
| similarity index 51%
|
| copy from Source/web/InbandTextTrackPrivateImpl.cpp
|
| copy to Source/web/WorkerPermissionClient.cpp
|
| index 0a36755ce437b3b9100a48415ab8b6be747148d4..d6ff42aea64d62c39b6f72e3d2b2de9fa8bd3906 100644
|
| --- a/Source/web/InbandTextTrackPrivateImpl.cpp
|
| +++ b/Source/web/WorkerPermissionClient.cpp
|
| @@ -29,74 +29,65 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "InbandTextTrackPrivateImpl.h"
|
| +#include "WorkerPermissionClient.h"
|
|
|
| -#include "WebInbandTextTrack.h"
|
| -#include "core/platform/graphics/InbandTextTrackPrivateClient.h"
|
| +#include "core/workers/WorkerGlobalScope.h"
|
| #include "public/platform/WebString.h"
|
| +#include "public/web/WebWorkerPermissionClientProxy.h"
|
| +#include "wtf/PassOwnPtr.h"
|
|
|
| -namespace WebKit {
|
| -
|
| -InbandTextTrackPrivateImpl::InbandTextTrackPrivateImpl(WebInbandTextTrack* track)
|
| - : m_track(track)
|
| -{
|
| - ASSERT(track);
|
| - track->setClient(this);
|
| -}
|
| +using namespace WebCore;
|
|
|
| -InbandTextTrackPrivateImpl::~InbandTextTrackPrivateImpl()
|
| -{
|
| - m_track->setClient(0);
|
| -}
|
| +namespace WebKit {
|
|
|
| -void InbandTextTrackPrivateImpl::setMode(Mode mode)
|
| +PassOwnPtr<WorkerPermissionClient> WorkerPermissionClient::create(PassOwnPtr<WebWorkerPermissionClientProxy> proxy)
|
| {
|
| - m_track->setMode(static_cast<WebInbandTextTrack::Mode>(mode));
|
| + return adoptPtr(new WorkerPermissionClient(proxy));
|
| }
|
|
|
| -WebCore::InbandTextTrackPrivate::Mode InbandTextTrackPrivateImpl::mode() const
|
| +WorkerPermissionClient::~WorkerPermissionClient()
|
| {
|
| - return static_cast<WebCore::InbandTextTrackPrivate::Mode>(m_track->mode());
|
| }
|
|
|
| -WebCore::InbandTextTrackPrivate::Kind InbandTextTrackPrivateImpl::kind() const
|
| +bool WorkerPermissionClient::allowDatabase(const WebString& name, const WebString& displayName, unsigned long estimatedSize)
|
| {
|
| - return static_cast<WebCore::InbandTextTrackPrivate::Kind>(m_track->kind());
|
| + if (!m_proxy)
|
| + return false;
|
| + return m_proxy->allowDatabase(name, displayName, estimatedSize);
|
| }
|
|
|
| -bool InbandTextTrackPrivateImpl::isClosedCaptions() const
|
| +bool WorkerPermissionClient::allowFileSystem()
|
| {
|
| - return m_track->isClosedCaptions();
|
| + if (!m_proxy)
|
| + return false;
|
| + return m_proxy->allowFileSystem();
|
| }
|
|
|
| -AtomicString InbandTextTrackPrivateImpl::label() const
|
| +bool WorkerPermissionClient::allowIndexedDB(const WebString& name)
|
| {
|
| - return m_track->label();
|
| + if (!m_proxy)
|
| + return false;
|
| + return m_proxy->allowIndexedDB(name);
|
| }
|
|
|
| -AtomicString InbandTextTrackPrivateImpl::language() const
|
| +const char* WorkerPermissionClient::supplementName()
|
| {
|
| - return m_track->language();
|
| + return "WorkerPermissionClient";
|
| }
|
|
|
| -bool InbandTextTrackPrivateImpl::isDefault() const
|
| +WorkerPermissionClient* WorkerPermissionClient::from(ExecutionContext* context)
|
| {
|
| - return m_track->isDefault();
|
| + return static_cast<WorkerPermissionClient*>(Supplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName()));
|
| }
|
|
|
| -int InbandTextTrackPrivateImpl::textTrackIndex() const
|
| +WorkerPermissionClient::WorkerPermissionClient(PassOwnPtr<WebWorkerPermissionClientProxy> proxy)
|
| + : m_proxy(proxy)
|
| {
|
| - return m_track->textTrackIndex();
|
| }
|
|
|
| -void InbandTextTrackPrivateImpl::addWebVTTCue(
|
| - double start,
|
| - double end,
|
| - const WebString& id,
|
| - const WebString& content,
|
| - const WebString& settings)
|
| +void providePermissionClientToWorker(WorkerClients* clients, PassOwnPtr<WebWorkerPermissionClientProxy> proxy)
|
| {
|
| - client()->addWebVTTCue(this, start, end, id, content, settings);
|
| + WorkerPermissionClient::provideTo(clients, WorkerPermissionClient::supplementName(), WorkerPermissionClient::create(proxy));
|
| }
|
|
|
| } // namespace WebKit
|
|
|