summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp4
-rw-r--r--Source/WebKit/android/WebCoreSupport/WebCookieJar.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
index dfb249d..1dc4637 100644
--- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
@@ -165,14 +165,14 @@ int WebCookieJar::getNumCookiesInDatabase()
}
// From CookiePolicy in chromium
-int WebCookieJar::CanGetCookies(const GURL&, const GURL&, net::CompletionCallback*)
+int WebCookieJar::CanGetCookies(const GURL&, const GURL&) const
{
MutexLocker lock(m_allowCookiesMutex);
return m_allowCookies ? net::OK : net::ERR_ACCESS_DENIED;
}
// From CookiePolicy in chromium
-int WebCookieJar::CanSetCookie(const GURL&, const GURL&, const std::string&, net::CompletionCallback*)
+int WebCookieJar::CanSetCookie(const GURL&, const GURL&, const std::string&) const
{
MutexLocker lock(m_allowCookiesMutex);
return m_allowCookies ? net::OK : net::ERR_ACCESS_DENIED;
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.h b/Source/WebKit/android/WebCoreSupport/WebCookieJar.h
index 1f4266c..b6490af 100644
--- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.h
+++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.h
@@ -43,8 +43,8 @@ public:
static void flush();
// CookiePolicy implementation from external/chromium
- virtual int CanGetCookies(const GURL& url, const GURL& first_party_for_cookies, net::CompletionCallback*);
- virtual int CanSetCookie(const GURL& url, const GURL& first_party_for_cookies, const std::string& cookie_line, net::CompletionCallback*);
+ virtual int CanGetCookies(const GURL& url, const GURL& first_party_for_cookies) const;
+ virtual int CanSetCookie(const GURL& url, const GURL& first_party_for_cookies, const std::string& cookie_line) const;
bool allowCookies();
void setAllowCookies(bool allow);
@@ -70,7 +70,7 @@ private:
scoped_refptr<SQLitePersistentCookieStore> m_cookieDb;
scoped_refptr<net::CookieStore> m_cookieStore;
bool m_allowCookies;
- WTF::Mutex m_allowCookiesMutex;
+ mutable WTF::Mutex m_allowCookiesMutex;
};
}