| Index: Source/modules/geolocation/testing/InternalsGeolocation.cpp
|
| diff --git a/Source/modules/geolocation/testing/InternalsGeolocation.cpp b/Source/modules/geolocation/testing/InternalsGeolocation.cpp
|
| index ff1f1b099563782fb9fe48432e63b86895229851..54251dd666054d3bdeda3ec40038b4f6eeb2efd5 100644
|
| --- a/Source/modules/geolocation/testing/InternalsGeolocation.cpp
|
| +++ b/Source/modules/geolocation/testing/InternalsGeolocation.cpp
|
| @@ -43,8 +43,8 @@ namespace WebCore {
|
|
|
| void InternalsGeolocation::setGeolocationClientMock(Internals&, Document* document)
|
| {
|
| - ASSERT(document && document->page());
|
| - GeolocationController* controller = GeolocationController::from(document->page());
|
| + ASSERT(document && document->frame());
|
| + GeolocationController* controller = GeolocationController::from(document->frame());
|
| GeolocationClientMock* client = new GeolocationClientMock();
|
| controller->setClientForTest(client);
|
| client->setController(controller);
|
| @@ -52,7 +52,7 @@ void InternalsGeolocation::setGeolocationClientMock(Internals&, Document* docume
|
|
|
| void InternalsGeolocation::setGeolocationPosition(Internals&, Document* document, double latitude, double longitude, double accuracy)
|
| {
|
| - ASSERT(document && document->page());
|
| + ASSERT(document && document->frame());
|
| GeolocationClientMock* client = geolocationClient(document);
|
| if (!client)
|
| return;
|
| @@ -61,7 +61,7 @@ void InternalsGeolocation::setGeolocationPosition(Internals&, Document* document
|
|
|
| void InternalsGeolocation::setGeolocationPositionUnavailableError(Internals&, Document* document, const String& message)
|
| {
|
| - ASSERT(document && document->page());
|
| + ASSERT(document && document->frame());
|
| GeolocationClientMock* client = geolocationClient(document);
|
| if (!client)
|
| return;
|
| @@ -70,7 +70,7 @@ void InternalsGeolocation::setGeolocationPositionUnavailableError(Internals&, Do
|
|
|
| void InternalsGeolocation::setGeolocationPermission(Internals&, Document* document, bool allowed)
|
| {
|
| - ASSERT(document && document->page());
|
| + ASSERT(document && document->frame());
|
| GeolocationClientMock* client = geolocationClient(document);
|
| if (!client)
|
| return;
|
| @@ -79,7 +79,7 @@ void InternalsGeolocation::setGeolocationPermission(Internals&, Document* docume
|
|
|
| int InternalsGeolocation::numberOfPendingGeolocationPermissionRequests(Internals&, Document* document)
|
| {
|
| - ASSERT(document && document->page());
|
| + ASSERT(document && document->frame());
|
| GeolocationClientMock* client = geolocationClient(document);
|
| if (!client)
|
| return -1;
|
| @@ -88,7 +88,7 @@ int InternalsGeolocation::numberOfPendingGeolocationPermissionRequests(Internals
|
|
|
| GeolocationClientMock* InternalsGeolocation::geolocationClient(Document* document)
|
| {
|
| - GeolocationController* controller = GeolocationController::from(document->page());
|
| + GeolocationController* controller = GeolocationController::from(document->frame());
|
| if (!controller->hasClientForTest())
|
| return 0;
|
| return static_cast<GeolocationClientMock*>(controller->client());
|
|
|