diff options
| author | kinuko <kinuko@chromium.org> | 2015-03-31 03:55:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-31 10:56:24 +0000 |
| commit | abac151b1992a2f9d8843ff0efa46888ddd636ba (patch) | |
| tree | 9a685bcacf24f84e8d77a23e7a40cd8dbe33b3cf /content/renderer | |
| parent | 9ccf2d8bc12213076b36c7f85edd6a6bdcb5ee92 (diff) | |
| download | chromium_src-abac151b1992a2f9d8843ff0efa46888ddd636ba.zip chromium_src-abac151b1992a2f9d8843ff0efa46888ddd636ba.tar.gz chromium_src-abac151b1992a2f9d8843ff0efa46888ddd636ba.tar.bz2 | |
ServiceWorker: Support non-window clients in Clients.matchAll (1/2 chromium)
- Change ServiceWorkerVersion::OnGetClients to also return non-window
clients if ClientQueryOptions specifies non-default/non-window client type
Blink-side patch: https://codereview.chromium.org/1040993003/
BUG=460415
TEST=to be added in blink
Review URL: https://codereview.chromium.org/1042933002
Cr-Commit-Position: refs/heads/master@{#323008}
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 6 | ||||
| -rw-r--r-- | content/renderer/shared_worker/embedded_shared_worker_stub.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index e51b906..c215b08 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -2412,9 +2412,9 @@ void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame, // exists). if (!ServiceWorkerNetworkProvider::FromDocumentState( DocumentState::FromDataSource(datasource))) { - scoped_ptr<ServiceWorkerNetworkProvider> - network_provider(new ServiceWorkerNetworkProvider( - routing_id_, SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE)); + scoped_ptr<ServiceWorkerNetworkProvider> network_provider( + new ServiceWorkerNetworkProvider(routing_id_, + SERVICE_WORKER_PROVIDER_FOR_WINDOW)); ServiceWorkerNetworkProvider::AttachToDocumentState( DocumentState::FromDataSource(datasource), network_provider.Pass()); diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc index d9d1418..9d1f82e 100644 --- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc +++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc @@ -237,7 +237,7 @@ EmbeddedSharedWorkerStub::createServiceWorkerNetworkProvider( // we can observe its requests. scoped_ptr<ServiceWorkerNetworkProvider> provider( new ServiceWorkerNetworkProvider( - MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE)); + MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER)); // The provider is kept around for the lifetime of the DataSource // and ownership is transferred to the DataSource. |