diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/mock | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/mock')
| -rw-r--r-- | Source/WebCore/platform/mock/GeolocationClientMock.cpp | 5 | ||||
| -rw-r--r-- | Source/WebCore/platform/mock/GeolocationClientMock.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/platform/mock/GeolocationClientMock.cpp b/Source/WebCore/platform/mock/GeolocationClientMock.cpp index 5255b34..d067c8a 100644 --- a/Source/WebCore/platform/mock/GeolocationClientMock.cpp +++ b/Source/WebCore/platform/mock/GeolocationClientMock.cpp @@ -79,6 +79,11 @@ void GeolocationClientMock::setPermission(bool allowed) asyncUpdatePermission(); } +int GeolocationClientMock::numberOfPendingPermissionRequests() const +{ + return m_pendingPermission.size(); +} + void GeolocationClientMock::requestPermission(Geolocation* geolocation) { m_pendingPermission.add(geolocation); diff --git a/Source/WebCore/platform/mock/GeolocationClientMock.h b/Source/WebCore/platform/mock/GeolocationClientMock.h index df35316..b400166 100644 --- a/Source/WebCore/platform/mock/GeolocationClientMock.h +++ b/Source/WebCore/platform/mock/GeolocationClientMock.h @@ -59,6 +59,7 @@ public: void setError(PassRefPtr<GeolocationError>); void setPosition(PassRefPtr<GeolocationPosition>); void setPermission(bool allowed); + int numberOfPendingPermissionRequests() const; // GeolocationClient virtual void geolocationDestroyed(); |