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

Unified Diff: Source/modules/geolocation/GeolocationController.cpp

Issue 422943002: Enable null GeolocationInspectorAgent for out-of-process iframes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/geolocation/GeolocationController.cpp
diff --git a/Source/modules/geolocation/GeolocationController.cpp b/Source/modules/geolocation/GeolocationController.cpp
index fea1c7b2a6f8f2bea904eaf825289a49d74d8e4e..96b83e1c9d365b009a1788ae9035538694814516 100644
--- a/Source/modules/geolocation/GeolocationController.cpp
+++ b/Source/modules/geolocation/GeolocationController.cpp
@@ -41,7 +41,7 @@ GeolocationController::GeolocationController(LocalFrame& frame, GeolocationClien
, m_client(client)
, m_hasClientForTest(false)
, m_isClientUpdating(false)
- , m_inspectorAgent()
+ , m_inspectorAgent(nullptr)
eseidel 2014/07/28 17:51:08 I'm confused why this change is needed? This is a
kenrb 2014/07/28 18:06:20 In release builds yes, but in debug it RawPtr gets
{
// FIXME: Once GeolocationInspectorAgent is per frame, there will be a 1:1 relationship between
// it and this class. Until then, there's one GeolocationInspectorAgent per page that the main
@@ -54,7 +54,10 @@ GeolocationController::GeolocationController(LocalFrame& frame, GeolocationClien
m_inspectorAgent = GeolocationController::from(frame.page()->deprecatedLocalMainFrame())->m_inspectorAgent;
}
- m_inspectorAgent->addController(this);
+ // m_inspectorAgent is 0 for out of process iframe instantiations, since inspector is currently unable
+ // to handle that scenario.
+ if (m_inspectorAgent)
+ m_inspectorAgent->addController(this);
if (!frame.isMainFrame() && frame.page()->mainFrame()->isLocalFrame()) {
// internals.setGeolocationClientMock is per page.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698