From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 3 Feb 2012 09:55:33 +0100 Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560) --- Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp') diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp index 26c518fd8..e61faa162 100644 --- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp +++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp @@ -137,7 +137,7 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector origin = WebSecurityOrigin::create(originAndDatabases.originIdentifier); + RefPtr origin = WebSecurityOrigin::createFromDatabaseIdentifier(originAndDatabases.originIdentifier); size_t databasesCount = originAndDatabases.databases.size(); Vector > databases(databasesCount); @@ -188,7 +188,7 @@ void WebDatabaseManagerProxy::didGetDatabaseOrigins(const Vector& origin Vector > securityOrigins(originIdentifiersCount); for (size_t i = 0; i < originIdentifiersCount; ++i) - securityOrigins[i] = WebSecurityOrigin::create(originIdentifiers[i]); + securityOrigins[i] = WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifiers[i]); callback->performCallbackWithReturnValue(ImmutableArray::adopt(securityOrigins).get()); } @@ -219,13 +219,13 @@ void WebDatabaseManagerProxy::setQuotaForOrigin(WebSecurityOrigin* origin, uint6 void WebDatabaseManagerProxy::didModifyOrigin(const String& originIdentifier) { - RefPtr origin = WebSecurityOrigin::create(originIdentifier); + RefPtr origin = WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifier); m_client.didModifyOrigin(this, origin.get()); } void WebDatabaseManagerProxy::didModifyDatabase(const String& originIdentifier, const String& databaseIdentifier) { - RefPtr origin = WebSecurityOrigin::create(originIdentifier); + RefPtr origin = WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifier); m_client.didModifyDatabase(this, origin.get(), databaseIdentifier); } -- cgit v1.2.1