| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 , m_isClientUpdating(false) | 43 , m_isClientUpdating(false) |
| 44 , m_inspectorAgent() | 44 , m_inspectorAgent() |
| 45 { | 45 { |
| 46 // FIXME: Once GeolocationInspectorAgent is per frame, there will be a 1:1 r
elationship between | 46 // FIXME: Once GeolocationInspectorAgent is per frame, there will be a 1:1 r
elationship between |
| 47 // it and this class. Until then, there's one GeolocationInspectorAgent per
page that the main | 47 // it and this class. Until then, there's one GeolocationInspectorAgent per
page that the main |
| 48 // frame is responsible for creating. | 48 // frame is responsible for creating. |
| 49 if (frame.isMainFrame()) { | 49 if (frame.isMainFrame()) { |
| 50 OwnPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorA
gent::create()); | 50 OwnPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorA
gent::create()); |
| 51 m_inspectorAgent = geolocationAgent.get(); | 51 m_inspectorAgent = geolocationAgent.get(); |
| 52 frame.page()->inspectorController().registerModuleAgent(geolocationAgent
.release()); | 52 frame.page()->inspectorController().registerModuleAgent(geolocationAgent
.release()); |
| 53 } else { | 53 } else if (frame.page()->mainFrame()->isLocalFrame()) { |
| 54 m_inspectorAgent = GeolocationController::from(frame.page()->deprecatedL
ocalMainFrame())->m_inspectorAgent; | 54 m_inspectorAgent = GeolocationController::from(frame.page()->deprecatedL
ocalMainFrame())->m_inspectorAgent; |
| 55 } | 55 } |
| 56 | 56 |
| 57 m_inspectorAgent->AddController(this); | 57 if (m_inspectorAgent) |
| 58 m_inspectorAgent->AddController(this); |
| 58 | 59 |
| 59 if (!frame.isMainFrame()) { | 60 if (!frame.isMainFrame() && frame.page()->mainFrame()->isLocalFrame()) { |
| 60 // internals.setGeolocationClientMock is per page. | 61 // internals.setGeolocationClientMock is per page. |
| 61 GeolocationController* mainController = GeolocationController::from(fram
e.page()->deprecatedLocalMainFrame()); | 62 GeolocationController* mainController = GeolocationController::from(fram
e.page()->deprecatedLocalMainFrame()); |
| 62 if (mainController->hasClientForTest()) | 63 if (mainController->hasClientForTest()) |
| 63 setClientForTest(mainController->client()); | 64 setClientForTest(mainController->client()); |
| 64 } | 65 } |
| 65 } | 66 } |
| 66 | 67 |
| 67 void GeolocationController::startUpdatingIfNeeded() | 68 void GeolocationController::startUpdatingIfNeeded() |
| 68 { | 69 { |
| 69 if (m_isClientUpdating) | 70 if (m_isClientUpdating) |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 visitor->trace(m_highAccuracyObservers); | 232 visitor->trace(m_highAccuracyObservers); |
| 232 WillBeHeapSupplement<LocalFrame>::trace(visitor); | 233 WillBeHeapSupplement<LocalFrame>::trace(visitor); |
| 233 } | 234 } |
| 234 | 235 |
| 235 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client) | 236 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client) |
| 236 { | 237 { |
| 237 WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::su
pplementName(), GeolocationController::create(frame, client)); | 238 WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::su
pplementName(), GeolocationController::create(frame, client)); |
| 238 } | 239 } |
| 239 | 240 |
| 240 } // namespace WebCore | 241 } // namespace WebCore |
| OLD | NEW |