| Index: public/web/WebSharedWorkerClient.h
|
| diff --git a/public/web/WebSharedWorkerClient.h b/public/web/WebSharedWorkerClient.h
|
| index 098fcaa4f3ad486cfa076f48a1fd4339d45a9059..2b661071ea2d188e1bb730acce109e6a58bb8107 100644
|
| --- a/public/web/WebSharedWorkerClient.h
|
| +++ b/public/web/WebSharedWorkerClient.h
|
| @@ -31,7 +31,8 @@
|
| #ifndef WebSharedWorkerClient_h
|
| #define WebSharedWorkerClient_h
|
|
|
| -#include "../platform/WebMessagePortChannel.h"
|
| +#include "public/platform/WebMessagePortChannel.h"
|
| +#include "public/web/WebWorkerPermissionClientProxy.h"
|
|
|
| namespace blink {
|
|
|
| @@ -43,7 +44,7 @@ class WebSecurityOrigin;
|
| class WebServiceWorkerNetworkProvider;
|
| class WebString;
|
| class WebWorker;
|
| -class WebWorkerPermissionClientProxy;
|
| +class WebWorkerContentSettingsClientProxy;
|
|
|
| // Provides an interface back to the in-page script object for a worker.
|
| // All functions are expected to be called back on the thread that created
|
| @@ -66,9 +67,14 @@ public:
|
| virtual WebApplicationCacheHost* createApplicationCacheHost(WebApplicationCacheHostClient*) = 0;
|
|
|
| // Called on the main thread during initialization.
|
| - // WebWorkerPermissionClientProxy should not retain the given
|
| + // WebWorkerContentSettingsClientProxy should not retain the given
|
| // WebSecurityOrigin, as the proxy instance is passed to worker thread
|
| // while WebSecurityOrigin is not thread safe.
|
| + virtual WebWorkerContentSettingsClientProxy* createWorkerContentSettingsClientProxy(const WebSecurityOrigin& origin)
|
| + {
|
| + return createWorkerPermissionClientProxy(origin);
|
| + }
|
| + // Deprecated call required by embedder.
|
| virtual WebWorkerPermissionClientProxy* createWorkerPermissionClientProxy(const WebSecurityOrigin&) { return nullptr; }
|
|
|
| // Called on the main thread during initialization.
|
|
|