summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 21:59:53 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 21:59:53 +0000
commitee9d73e106375cf51fa508c8acb5070bcfa05bf3 (patch)
tree4dae1caed4812f67fa55d8804086205dd32ddfcb /webkit
parent9ddb1e9d3c36bcd5af1a96cd0452fcb3e3c36dc5 (diff)
downloadchromium_src-ee9d73e106375cf51fa508c8acb5070bcfa05bf3.zip
chromium_src-ee9d73e106375cf51fa508c8acb5070bcfa05bf3.tar.gz
chromium_src-ee9d73e106375cf51fa508c8acb5070bcfa05bf3.tar.bz2
Roll WebKit to 48734. Includes 2 sided patch of mine.
Match the new interfaces used for StorageNamespace in WebKit. TBR=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/219038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/api/src/StorageNamespaceProxy.cpp2
-rw-r--r--webkit/api/src/StorageNamespaceProxy.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/api/src/StorageNamespaceProxy.cpp b/webkit/api/src/StorageNamespaceProxy.cpp
index 2ef5508..61acf1b 100644
--- a/webkit/api/src/StorageNamespaceProxy.cpp
+++ b/webkit/api/src/StorageNamespaceProxy.cpp
@@ -61,7 +61,7 @@ PassRefPtr<StorageNamespace> StorageNamespaceProxy::copy()
return adoptRef(new StorageNamespaceProxy(m_storageNamespace->copy()));
}
-PassRefPtr<StorageArea> StorageNamespaceProxy::storageArea(SecurityOrigin* origin)
+PassRefPtr<StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<SecurityOrigin> origin)
{
return adoptRef(new StorageAreaProxy(m_storageNamespace->createStorageArea(origin->toString())));
}
diff --git a/webkit/api/src/StorageNamespaceProxy.h b/webkit/api/src/StorageNamespaceProxy.h
index 2ad4c46..02020e0 100644
--- a/webkit/api/src/StorageNamespaceProxy.h
+++ b/webkit/api/src/StorageNamespaceProxy.h
@@ -38,7 +38,7 @@ namespace WebCore {
public:
StorageNamespaceProxy(WebKit::WebStorageNamespace* storageNamespace);
virtual ~StorageNamespaceProxy();
- virtual PassRefPtr<StorageArea> storageArea(SecurityOrigin*);
+ virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>);
virtual PassRefPtr<StorageNamespace> copy();
virtual void close();
virtual void unlock();