Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: Source/modules/serviceworkers/NavigatorServiceWorker.cpp

Issue 1308723003: DOMWindow::navigator should return navigator w/o frame when detached. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/serviceworkers/NavigatorServiceWorker.cpp
diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
index d2552311f9a3ba290dd69584d2e2b505c29e230f..cd79bf694cfddd862ae565bcd69329700e6f6906 100644
--- a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
+++ b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
@@ -26,8 +26,10 @@ NavigatorServiceWorker* NavigatorServiceWorker::from(Document& document)
{
if (!document.frame() || !document.frame()->domWindow())
return nullptr;
- Navigator& navigator = *document.frame()->domWindow()->navigator();
- return &from(navigator);
+ Navigator* navigator = document.frame()->domWindow()->navigator();
+ if (!navigator)
+ return nullptr;
+ return &from(*navigator);
}
NavigatorServiceWorker& NavigatorServiceWorker::from(Navigator& navigator)

Powered by Google App Engine
This is Rietveld 408576698