diff options
| author | horo <horo@chromium.org> | 2014-09-24 21:24:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 04:25:01 +0000 |
| commit | bb0a225bc67c750c0c53c5ce99be9f505954409e (patch) | |
| tree | 534d392ccefea3f386349765b1693fa8a9556fff | |
| parent | 90949afe82b9f509e09dcde95700a3839a04f7db (diff) | |
| download | chromium_src-bb0a225bc67c750c0c53c5ce99be9f505954409e.zip chromium_src-bb0a225bc67c750c0c53c5ce99be9f505954409e.tar.gz chromium_src-bb0a225bc67c750c0c53c5ce99be9f505954409e.tar.bz2 | |
[ServiceWorker] Don't send fetch event to the ServiceWorker if the page is not controled by it yet.
Currenty active_version() is used to check whether the page is under the control of the ServiceWorker.
But this is not correct.
We have to use controlling_version().
BUG=417351
TEST=http/tests/serviceworker/uncontrolled-page.html in https://codereview.chromium.org/600843003
Review URL: https://codereview.chromium.org/600303002
Cr-Commit-Position: refs/heads/master@{#296643}
| -rw-r--r-- | content/browser/service_worker/service_worker_provider_host.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc index 4376516..b19b812 100644 --- a/content/browser/service_worker/service_worker_provider_host.cc +++ b/content/browser/service_worker/service_worker_provider_host.cc @@ -154,7 +154,7 @@ ServiceWorkerProviderHost::CreateRequestHandler( context_, AsWeakPtr(), blob_storage_context, resource_type)); } if (ServiceWorkerUtils::IsMainResourceType(resource_type) || - active_version()) { + controlling_version()) { return scoped_ptr<ServiceWorkerRequestHandler>( new ServiceWorkerControlleeRequestHandler( context_, AsWeakPtr(), blob_storage_context, resource_type, body)); |