diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 01:09:27 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 01:09:27 +0000 |
| commit | 542f5d87839b13a547337d84611641641cab55d6 (patch) | |
| tree | a9b2290436350fd382e59e8c62b7b8d890a48786 /webkit | |
| parent | 4324f4c16325d62ff799d4a90f3437ed6e9ea48b (diff) | |
| download | chromium_src-542f5d87839b13a547337d84611641641cab55d6.zip chromium_src-542f5d87839b13a547337d84611641641cab55d6.tar.gz chromium_src-542f5d87839b13a547337d84611641641cab55d6.tar.bz2 | |
Revert "Save a reference to the origin passed into the StorageAreaImpl for as long"
This reverts commit f604ba19d0f74aafc8d6dba3d2e53f297f8446ed.
TBR=jorlow
Review URL: http://codereview.chromium.org/164036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/api/src/WebStorageAreaImpl.cpp | 4 | ||||
| -rw-r--r-- | webkit/api/src/WebStorageAreaImpl.h | 5 | ||||
| -rw-r--r-- | webkit/api/src/WebStorageNamespaceImpl.cpp | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/webkit/api/src/WebStorageAreaImpl.cpp b/webkit/api/src/WebStorageAreaImpl.cpp index d7115bf..6a5a762 100644 --- a/webkit/api/src/WebStorageAreaImpl.cpp +++ b/webkit/api/src/WebStorageAreaImpl.cpp @@ -34,14 +34,12 @@ #if ENABLE(DOM_STORAGE) #include "ExceptionCode.h" -#include "SecurityOrigin.h" #include "WebString.h" namespace WebKit { -WebStorageAreaImpl::WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea, PassRefPtr<WebCore::SecurityOrigin> origin) +WebStorageAreaImpl::WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea) : m_storageArea(storageArea) - , m_origin(origin) { } diff --git a/webkit/api/src/WebStorageAreaImpl.h b/webkit/api/src/WebStorageAreaImpl.h index d855360..5e5ffc4 100644 --- a/webkit/api/src/WebStorageAreaImpl.h +++ b/webkit/api/src/WebStorageAreaImpl.h @@ -40,7 +40,7 @@ namespace WebKit { class WebStorageAreaImpl : public WebStorageArea { public: - WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea, PassRefPtr<WebCore::SecurityOrigin> origin); + WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea); virtual ~WebStorageAreaImpl(); virtual void lock(bool& invalidateCache, size_t& bytesLeftInQuota); virtual void unlock(); @@ -53,9 +53,6 @@ namespace WebKit { private: RefPtr<WebCore::StorageArea> m_storageArea; - - // We must store a reference to this because m_storageArea contains a pointer to it. - RefPtr<WebCore::SecurityOrigin> m_origin; }; } // namespace WebKit diff --git a/webkit/api/src/WebStorageNamespaceImpl.cpp b/webkit/api/src/WebStorageNamespaceImpl.cpp index 991aa2a..e6fa684 100644 --- a/webkit/api/src/WebStorageNamespaceImpl.cpp +++ b/webkit/api/src/WebStorageNamespaceImpl.cpp @@ -62,7 +62,7 @@ WebStorageNamespaceImpl::~WebStorageNamespaceImpl() WebStorageArea* WebStorageNamespaceImpl::createStorageArea(const WebString& originString) { RefPtr<WebCore::SecurityOrigin> origin = WebCore::SecurityOrigin::createFromString(originString); - return new WebStorageAreaImpl(m_storageNamespace->storageArea(origin.get()), origin.release()); + return new WebStorageAreaImpl(m_storageNamespace->storageArea(origin.get())); } WebStorageNamespace* WebStorageNamespaceImpl::copy() |