Index: Source/modules/serviceworkers/NavigatorServiceWorker.cpp |
diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp |
index 07e5136ee61f542f741e241c28e44d1a26bb42a5..86cb30d463f522484667677ffa1c041b88742f74 100644 |
--- a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp |
+++ b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp |
@@ -15,6 +15,7 @@ namespace blink { |
NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator) |
: DOMWindowProperty(navigator.frame()) |
+ , m_domWindow(navigator.frame()->domWindow()) |
{ |
} |
@@ -57,9 +58,9 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(Navigator& navigat |
ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker() |
{ |
- if (!m_serviceWorker && frame()) { |
- ASSERT(frame()->domWindow()); |
- m_serviceWorker = ServiceWorkerContainer::create(frame()->domWindow()->executionContext()); |
+ if (!m_serviceWorker && m_domWindow) { |
+ ASSERT(m_domWindow->executionContext()); |
+ m_serviceWorker = ServiceWorkerContainer::create(m_domWindow->executionContext()); |
} |
return m_serviceWorker.get(); |
} |