From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 25 May 2011 19:08:45 +0100
Subject: Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
---
 Source/WebKit/chromium/src/WebGeolocationClientMock.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Source/WebKit/chromium/src/WebGeolocationClientMock.cpp')

diff --git a/Source/WebKit/chromium/src/WebGeolocationClientMock.cpp b/Source/WebKit/chromium/src/WebGeolocationClientMock.cpp
index 1ec3dd1..0ad47da 100644
--- a/Source/WebKit/chromium/src/WebGeolocationClientMock.cpp
+++ b/Source/WebKit/chromium/src/WebGeolocationClientMock.cpp
@@ -82,6 +82,11 @@ void WebGeolocationClientMock::setPermission(bool allowed)
     m_clientMock->setPermission(allowed);
 }
 
+int WebGeolocationClientMock::numberOfPendingPermissionRequests() const
+{
+    return m_clientMock->numberOfPendingPermissionRequests();
+}
+
 void WebGeolocationClientMock::resetMock()
 {
     m_clientMock->reset();
-- 
cgit v1.1