| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 { | 67 { |
| 68 return "NavigatorServiceWorker"; | 68 return "NavigatorServiceWorker"; |
| 69 } | 69 } |
| 70 | 70 |
| 71 WebServiceWorkerProvider* NavigatorServiceWorker::ensureProvider() | 71 WebServiceWorkerProvider* NavigatorServiceWorker::ensureProvider() |
| 72 { | 72 { |
| 73 ASSERT(m_navigator->frame()); | 73 ASSERT(m_navigator->frame()); |
| 74 if (!m_provider) { | 74 if (!m_provider) { |
| 75 Frame* frame = m_navigator->frame(); | 75 Frame* frame = m_navigator->frame(); |
| 76 | 76 |
| 77 FrameLoaderClient* client = frame->loader()->client(); | 77 FrameLoaderClient* client = frame->loader().client(); |
| 78 // FIXME: This is temporarily hooked up here until we hook up to the loa
ding process. | 78 // FIXME: This is temporarily hooked up here until we hook up to the loa
ding process. |
| 79 m_provider = client->createServiceWorkerProvider(nullptr); | 79 m_provider = client->createServiceWorkerProvider(nullptr); |
| 80 } | 80 } |
| 81 return m_provider.get(); | 81 return m_provider.get(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 NavigatorServiceWorker* NavigatorServiceWorker::from(Navigator* navigator) | 84 NavigatorServiceWorker* NavigatorServiceWorker::from(Navigator* navigator) |
| 85 { | 85 { |
| 86 NavigatorServiceWorker* supplement = toNavigatorServiceWorker(navigator); | 86 NavigatorServiceWorker* supplement = toNavigatorServiceWorker(navigator); |
| 87 if (!supplement) { | 87 if (!supplement) { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 155 } |
| 156 | 156 |
| 157 void NavigatorServiceWorker::willDetachGlobalObjectFromFrame() | 157 void NavigatorServiceWorker::willDetachGlobalObjectFromFrame() |
| 158 { | 158 { |
| 159 m_provider = nullptr; | 159 m_provider = nullptr; |
| 160 DOMWindowProperty::willDetachGlobalObjectFromFrame(); | 160 DOMWindowProperty::willDetachGlobalObjectFromFrame(); |
| 161 } | 161 } |
| 162 | 162 |
| 163 | 163 |
| 164 } // namespace WebCore | 164 } // namespace WebCore |
| OLD | NEW |