Preparing Blink for cross-process frame tree replication

Source/modules/geolocation/GeolocationController.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 32 matching lines @@
     , m_isClientUpdating(false)
     , m_inspectorAgent()
 {
     // 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
     // frame is responsible for creating.
     if (frame.isMainFrame()) {
         OwnPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorAgent::create());
         m_inspectorAgent = geolocationAgent.get();
         frame.page()->inspectorController().registerModuleAgent(geolocationAgent.release());
-    } else {
+    } else if (frame.page()->mainFrame()->isLocalFrame()) {
         m_inspectorAgent = GeolocationController::from(frame.page()->deprecatedLocalMainFrame())->m_inspectorAgent;
     }
 
-    m_inspectorAgent->AddController(this);
+    if (m_inspectorAgent)
+        m_inspectorAgent->AddController(this);
 
-    if (!frame.isMainFrame()) {
+    if (!frame.isMainFrame() && frame.page()->mainFrame()->isLocalFrame()) {
         // internals.setGeolocationClientMock is per page.
         GeolocationController* mainController = GeolocationController::from(frame.page()->deprecatedLocalMainFrame());
         if (mainController->hasClientForTest())
             setClientForTest(mainController->client());
     }
 }
 
 void GeolocationController::startUpdatingIfNeeded()
 {
     if (m_isClientUpdating)
@@ skipping 161 matching lines @@
     visitor->trace(m_highAccuracyObservers);
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client)
 {
     WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::supplementName(), GeolocationController::create(frame, client));
 }
 
 } // namespace WebCore