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

Unified Diff: Source/modules/vr/NavigatorVRDevice.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/vr/NavigatorVRDevice.cpp
diff --git a/Source/modules/vr/NavigatorVRDevice.cpp b/Source/modules/vr/NavigatorVRDevice.cpp
index 6987356e7c603b5b6e4eeb43ba0becf64bef8fa5..eba8cee403dac67f827c061fdf7cbf129c622b1a 100644
--- a/Source/modules/vr/NavigatorVRDevice.cpp
+++ b/Source/modules/vr/NavigatorVRDevice.cpp
@@ -26,9 +26,11 @@ namespace blink {
NavigatorVRDevice* NavigatorVRDevice::from(Document& document)
{
if (!document.frame() || !document.frame()->domWindow())
- return 0;
- Navigator& navigator = *document.frame()->domWindow()->navigator();
- return &from(navigator);
+ return nullptr;
+ Navigator* navigator = document.frame()->domWindow()->navigator();
+ if (!navigator)
+ return nullptr;
+ return &from(*navigator);
}
NavigatorVRDevice& NavigatorVRDevice::from(Navigator& navigator)

Powered by Google App Engine
This is Rietveld 408576698