| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 | 136 |
| 137 ServiceWorker* ServiceWorker::GetOrCreate( | 137 ServiceWorker* ServiceWorker::GetOrCreate( |
| 138 ExecutionContext* execution_context, | 138 ExecutionContext* execution_context, |
| 139 std::unique_ptr<WebServiceWorker::Handle> handle) { | 139 std::unique_ptr<WebServiceWorker::Handle> handle) { |
| 140 if (!handle) | 140 if (!handle) |
| 141 return nullptr; | 141 return nullptr; |
| 142 | 142 |
| 143 ServiceWorker* existing_worker = | 143 ServiceWorker* existing_worker = |
| 144 static_cast<ServiceWorker*>(handle->ServiceWorker()->Proxy()); | 144 static_cast<ServiceWorker*>(handle->ServiceWorker()->Proxy()); |
| 145 if (existing_worker) { | 145 if (existing_worker) { |
| 146 ASSERT(existing_worker->GetExecutionContext() == execution_context); | 146 DCHECK_EQ(existing_worker->GetExecutionContext(), execution_context); |
| 147 return existing_worker; | 147 return existing_worker; |
| 148 } | 148 } |
| 149 | 149 |
| 150 return new ServiceWorker(execution_context, std::move(handle)); | 150 return new ServiceWorker(execution_context, std::move(handle)); |
| 151 } | 151 } |
| 152 | 152 |
| 153 ServiceWorker::ServiceWorker(ExecutionContext* execution_context, | 153 ServiceWorker::ServiceWorker(ExecutionContext* execution_context, |
| 154 std::unique_ptr<WebServiceWorker::Handle> handle) | 154 std::unique_ptr<WebServiceWorker::Handle> handle) |
| 155 : AbstractWorker(execution_context), | 155 : AbstractWorker(execution_context), |
| 156 handle_(std::move(handle)), | 156 handle_(std::move(handle)), |
| 157 was_stopped_(false) { | 157 was_stopped_(false) { |
| 158 DCHECK(handle_); | 158 DCHECK(handle_); |
| 159 handle_->ServiceWorker()->SetProxy(this); | 159 handle_->ServiceWorker()->SetProxy(this); |
| 160 } | 160 } |
| 161 | 161 |
| 162 ServiceWorker::~ServiceWorker() {} | 162 ServiceWorker::~ServiceWorker() {} |
| 163 | 163 |
| 164 DEFINE_TRACE(ServiceWorker) { | 164 DEFINE_TRACE(ServiceWorker) { |
| 165 AbstractWorker::Trace(visitor); | 165 AbstractWorker::Trace(visitor); |
| 166 } | 166 } |
| 167 | 167 |
| 168 } // namespace blink | 168 } // namespace blink |
| OLD | NEW |