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

Side by Side Diff: Source/modules/serviceworkers/ServiceWorker.cpp

Issue 323523002: ServiceWorker::from can handle null ServiceWorkers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: null test. Created 6 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 case blink::WebServiceWorkerStateDeactivated: 133 case blink::WebServiceWorkerStateDeactivated:
134 return deactivated; 134 return deactivated;
135 default: 135 default:
136 ASSERT_NOT_REACHED(); 136 ASSERT_NOT_REACHED();
137 return nullAtom; 137 return nullAtom;
138 } 138 }
139 } 139 }
140 140
141 PassRefPtr<ServiceWorker> ServiceWorker::from(ExecutionContext* executionContext , WebType* worker) 141 PassRefPtr<ServiceWorker> ServiceWorker::from(ExecutionContext* executionContext , WebType* worker)
142 { 142 {
143 if (!worker)
144 return PassRefPtr<ServiceWorker>();
145
143 blink::WebServiceWorkerProxy* proxy = worker->proxy(); 146 blink::WebServiceWorkerProxy* proxy = worker->proxy();
144 ServiceWorker* existingServiceWorker = proxy ? proxy->unwrap() : 0; 147 ServiceWorker* existingServiceWorker = proxy ? proxy->unwrap() : 0;
145 if (existingServiceWorker) { 148 if (existingServiceWorker) {
146 ASSERT(existingServiceWorker->executionContext() == executionContext); 149 ASSERT(existingServiceWorker->executionContext() == executionContext);
147 return existingServiceWorker; 150 return existingServiceWorker;
148 } 151 }
149 152
150 return create(executionContext, adoptPtr(worker)); 153 return create(executionContext, adoptPtr(worker));
151 } 154 }
152 155
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 , WebServiceWorkerProxy(this) 188 , WebServiceWorkerProxy(this)
186 , m_outerWorker(worker) 189 , m_outerWorker(worker)
187 , m_isPromisePending(false) 190 , m_isPromisePending(false)
188 { 191 {
189 ScriptWrappable::init(this); 192 ScriptWrappable::init(this);
190 ASSERT(m_outerWorker); 193 ASSERT(m_outerWorker);
191 m_outerWorker->setProxy(this); 194 m_outerWorker->setProxy(this);
192 } 195 }
193 196
194 } // namespace WebCore 197 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698