OLD | NEW |
---|---|
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
104 } | 104 } |
105 } | 105 } |
106 | 106 |
107 ServiceWorker* ServiceWorker::from(ExecutionContext* executionContext, PassOwnPt r<WebServiceWorker::Handle> handle) | 107 ServiceWorker* ServiceWorker::from(ExecutionContext* executionContext, PassOwnPt r<WebServiceWorker::Handle> handle) |
108 { | 108 { |
109 return getOrCreate(executionContext, handle); | 109 return getOrCreate(executionContext, handle); |
110 } | 110 } |
111 | 111 |
112 bool ServiceWorker::hasPendingActivity() const | 112 bool ServiceWorker::hasPendingActivity() const |
113 { | 113 { |
114 if (AbstractWorker::hasPendingActivity()) | 114 if (!executionContext()) |
sof
2016/03/02 19:59:57
Using !executionContext() here rather than an expl
haraken
2016/03/03 02:39:37
Right.
| |
115 return true; | |
116 if (m_wasStopped) | |
117 return false; | 115 return false; |
118 return m_handle->serviceWorker()->state() != WebServiceWorkerStateRedundant; | 116 return m_handle->serviceWorker()->state() != WebServiceWorkerStateRedundant; |
119 } | 117 } |
120 | 118 |
121 void ServiceWorker::stop() | |
122 { | |
123 m_wasStopped = true; | |
124 } | |
125 | |
126 ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, Pa ssOwnPtr<WebServiceWorker::Handle> handle) | 119 ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, Pa ssOwnPtr<WebServiceWorker::Handle> handle) |
127 { | 120 { |
128 if (!handle) | 121 if (!handle) |
129 return nullptr; | 122 return nullptr; |
130 | 123 |
131 ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceW orker()->proxy()); | 124 ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceW orker()->proxy()); |
132 if (existingWorker) { | 125 if (existingWorker) { |
133 ASSERT(existingWorker->executionContext() == executionContext); | 126 ASSERT(existingWorker->executionContext() == executionContext); |
134 return existingWorker; | 127 return existingWorker; |
135 } | 128 } |
136 | 129 |
137 ServiceWorker* newWorker = new ServiceWorker(executionContext, handle); | 130 return new ServiceWorker(executionContext, handle); |
138 newWorker->suspendIfNeeded(); | |
139 return newWorker; | |
140 } | 131 } |
141 | 132 |
142 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebS erviceWorker::Handle> handle) | 133 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebS erviceWorker::Handle> handle) |
143 : AbstractWorker(executionContext) | 134 : AbstractWorker(executionContext) |
144 , m_handle(handle) | 135 , m_handle(handle) |
145 , m_wasStopped(false) | |
146 { | 136 { |
147 ASSERT(m_handle); | 137 ASSERT(m_handle); |
148 m_handle->serviceWorker()->setProxy(this); | 138 m_handle->serviceWorker()->setProxy(this); |
149 } | 139 } |
150 | 140 |
151 ServiceWorker::~ServiceWorker() | 141 ServiceWorker::~ServiceWorker() |
152 { | 142 { |
153 } | 143 } |
154 | 144 |
155 } // namespace blink | 145 } // namespace blink |
OLD | NEW |