Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Side by Side Diff: content/browser/service_worker/service_worker_registration.cc

Issue 182383008: Create chrome://serviceworker-internals (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix GetInfo / const stuff Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_registration.h" 5 #include "content/browser/service_worker/service_worker_registration.h"
6 6
7 #include "content/browser/service_worker/service_worker_info.h"
7 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
8 9
9 namespace content { 10 namespace content {
10 11
11 ServiceWorkerRegistration::ServiceWorkerRegistration(const GURL& pattern, 12 ServiceWorkerRegistration::ServiceWorkerRegistration(const GURL& pattern,
12 const GURL& script_url, 13 const GURL& script_url,
13 int64 registration_id) 14 int64 registration_id)
14 : pattern_(pattern), 15 : pattern_(pattern),
15 script_url_(script_url), 16 script_url_(script_url),
16 registration_id_(registration_id), 17 registration_id_(registration_id),
(...skipping 11 matching lines...) Expand all
28 DCHECK(!is_shutdown_); 29 DCHECK(!is_shutdown_);
29 if (active_version_) 30 if (active_version_)
30 active_version_->Shutdown(); 31 active_version_->Shutdown();
31 active_version_ = NULL; 32 active_version_ = NULL;
32 if (pending_version_) 33 if (pending_version_)
33 pending_version_->Shutdown(); 34 pending_version_->Shutdown();
34 pending_version_ = NULL; 35 pending_version_ = NULL;
35 is_shutdown_ = true; 36 is_shutdown_ = true;
36 } 37 }
37 38
39 ServiceWorkerRegistrationInfo ServiceWorkerRegistration::GetInfo() {
40 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
41 return ServiceWorkerRegistrationInfo(
42 script_url(),
43 pattern(),
44 active_version_ ? ServiceWorkerVersionInfo() : active_version_->GetInfo(),
45 pending_version_ ? ServiceWorkerVersionInfo()
46 : pending_version_->GetInfo());
michaeln 2014/03/06 01:19:02 Did you run this code? It looks like it will crash
alecflett 2014/03/06 19:25:15 sorry last minute refactoring, good catch. Done.
47 }
48
38 void ServiceWorkerRegistration::ActivatePendingVersion() { 49 void ServiceWorkerRegistration::ActivatePendingVersion() {
39 active_version_->Shutdown(); 50 active_version_->Shutdown();
40 active_version_ = pending_version_; 51 active_version_ = pending_version_;
41 pending_version_ = NULL; 52 pending_version_ = NULL;
42 } 53 }
43 54
44 } // namespace content 55 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698