| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 78 |
| 79 ServiceWorkerGlobalScopeProxy::~ServiceWorkerGlobalScopeProxy() | 79 ServiceWorkerGlobalScopeProxy::~ServiceWorkerGlobalScopeProxy() |
| 80 { | 80 { |
| 81 // Verify that the proxy has been detached. | 81 // Verify that the proxy has been detached. |
| 82 DCHECK(!m_embeddedWorker); | 82 DCHECK(!m_embeddedWorker); |
| 83 } | 83 } |
| 84 | 84 |
| 85 DEFINE_TRACE(ServiceWorkerGlobalScopeProxy) | 85 DEFINE_TRACE(ServiceWorkerGlobalScopeProxy) |
| 86 { | 86 { |
| 87 visitor->trace(m_document); | 87 visitor->trace(m_document); |
| 88 visitor->trace(m_workerGlobalScope); | |
| 89 } | 88 } |
| 90 | 89 |
| 91 void ServiceWorkerGlobalScopeProxy::setRegistration(std::unique_ptr<WebServiceWo
rkerRegistration::Handle> handle) | 90 void ServiceWorkerGlobalScopeProxy::setRegistration(std::unique_ptr<WebServiceWo
rkerRegistration::Handle> handle) |
| 92 { | 91 { |
| 93 workerGlobalScope()->setRegistration(std::move(handle)); | 92 workerGlobalScope()->setRegistration(std::move(handle)); |
| 94 } | 93 } |
| 95 | 94 |
| 96 void ServiceWorkerGlobalScopeProxy::dispatchActivateEvent(int eventID) | 95 void ServiceWorkerGlobalScopeProxy::dispatchActivateEvent(int eventID) |
| 97 { | 96 { |
| 98 WaitUntilObserver* observer = WaitUntilObserver::create(workerGlobalScope(),
WaitUntilObserver::Activate, eventID); | 97 WaitUntilObserver* observer = WaitUntilObserver::create(workerGlobalScope(),
WaitUntilObserver::Activate, eventID); |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 return *m_document; | 332 return *m_document; |
| 334 } | 333 } |
| 335 | 334 |
| 336 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() con
st | 335 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() con
st |
| 337 { | 336 { |
| 338 DCHECK(m_workerGlobalScope); | 337 DCHECK(m_workerGlobalScope); |
| 339 return m_workerGlobalScope; | 338 return m_workerGlobalScope; |
| 340 } | 339 } |
| 341 | 340 |
| 342 } // namespace blink | 341 } // namespace blink |
| OLD | NEW |