| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "config.h" | 5 #include "config.h" |
| 6 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 6 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
| 7 | 7 |
| 8 #include "core/frame/Navigator.h" | 8 #include "core/frame/Navigator.h" |
| 9 #include "modules/serviceworkers/ServiceWorkerContainer.h" | 9 #include "modules/serviceworkers/ServiceWorkerContainer.h" |
| 10 | 10 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExecutionContext*
executionContext) | 47 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExecutionContext*
executionContext) |
| 48 { | 48 { |
| 49 if (!m_serviceWorker && frame()) | 49 if (!m_serviceWorker && frame()) |
| 50 m_serviceWorker = ServiceWorkerContainer::create(executionContext); | 50 m_serviceWorker = ServiceWorkerContainer::create(executionContext); |
| 51 return m_serviceWorker.get(); | 51 return m_serviceWorker.get(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 void NavigatorServiceWorker::willDetachGlobalObjectFromFrame() | 54 void NavigatorServiceWorker::willDetachGlobalObjectFromFrame() |
| 55 { | 55 { |
| 56 m_serviceWorker->detachClient(); | 56 if (m_serviceWorker) { |
| 57 m_serviceWorker = nullptr; | 57 m_serviceWorker->detachClient(); |
| 58 m_serviceWorker = nullptr; |
| 59 } |
| 58 } | 60 } |
| 59 | 61 |
| 60 } // namespace WebCore | 62 } // namespace WebCore |
| OLD | NEW |