Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 172 deletions

diff --git a/WebCore/storage/StorageNamespaceImpl.cpp b/WebCore/storage/StorageNamespaceImpl.cpp
deleted file mode 100644
index 68508a7..0000000
--- a/WebCore/storage/StorageNamespaceImpl.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "StorageNamespaceImpl.h"
-
-#if ENABLE(DOM_STORAGE)
-
-#include "SecurityOriginHash.h"
-#include "StorageAreaImpl.h"
-#include "StorageMap.h"
-#include "StorageSyncManager.h"
-#include <wtf/StdLibExtras.h>
-#include <wtf/text/StringHash.h>
-
-#ifdef ANDROID
-#include "Page.h"
-#endif
-
-namespace WebCore {
-
-typedef HashMap<String, StorageNamespace*> LocalStorageNamespaceMap;
-
-static LocalStorageNamespaceMap& localStorageNamespaceMap()
-{
-    DEFINE_STATIC_LOCAL(LocalStorageNamespaceMap, localStorageNamespaceMap, ());
-    return localStorageNamespaceMap;
-}
-
-PassRefPtr<StorageNamespace> StorageNamespaceImpl::localStorageNamespace(const String& path, unsigned quota)
-{
-    const String lookupPath = path.isNull() ? String("") : path;
-    LocalStorageNamespaceMap::iterator it = localStorageNamespaceMap().find(lookupPath);
-    if (it == localStorageNamespaceMap().end()) {
-        RefPtr<StorageNamespace> storageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, lookupPath, quota));
-        localStorageNamespaceMap().set(lookupPath, storageNamespace.get());
-        return storageNamespace.release();
-    }
-
-    return it->second;
-}
-
-PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace(unsigned quota)
-{
-    return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), quota));
-}
-
-StorageNamespaceImpl::StorageNamespaceImpl(StorageType storageType, const String& path, unsigned quota)
-    : m_storageType(storageType)
-    , m_path(path.crossThreadString())
-    , m_syncManager(0)
-    , m_quota(quota)
-    , m_isShutdown(false)
-{
-    if (m_storageType == LocalStorage && !m_path.isEmpty())
-        m_syncManager = StorageSyncManager::create(m_path);
-}
-
-StorageNamespaceImpl::~StorageNamespaceImpl()
-{
-    ASSERT(isMainThread());
-
-    if (m_storageType == LocalStorage) {
-        ASSERT(localStorageNamespaceMap().get(m_path) == this);
-        localStorageNamespaceMap().remove(m_path);
-    }
-
-    if (!m_isShutdown)
-        close();
-}
-
-PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy()
-{
-    ASSERT(isMainThread());
-    ASSERT(!m_isShutdown);
-    ASSERT(m_storageType == SessionStorage);
-
-    RefPtr<StorageNamespaceImpl> newNamespace = adoptRef(new StorageNamespaceImpl(m_storageType, m_path, m_quota));
-
-    StorageAreaMap::iterator end = m_storageAreaMap.end();
-    for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i)
-        newNamespace->m_storageAreaMap.set(i->first, i->second->copy());
-    return newNamespace.release();
-}
-
-PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> prpOrigin)
-{
-    ASSERT(isMainThread());
-    ASSERT(!m_isShutdown);
-
-    RefPtr<SecurityOrigin> origin = prpOrigin;
-    RefPtr<StorageAreaImpl> storageArea;
-    if ((storageArea = m_storageAreaMap.get(origin)))
-        return storageArea.release();
-
-    storageArea = StorageAreaImpl::create(m_storageType, origin, m_syncManager, m_quota);
-    m_storageAreaMap.set(origin.release(), storageArea);
-    return storageArea.release();
-}
-
-void StorageNamespaceImpl::close()
-{
-    ASSERT(isMainThread());
-
-    if (m_isShutdown)
-        return;
-
-    // If we're session storage, we shouldn't need to do any work here.
-    if (m_storageType == SessionStorage) {
-        ASSERT(!m_syncManager);
-        return;
-    }
-
-    StorageAreaMap::iterator end = m_storageAreaMap.end();
-    for (StorageAreaMap::iterator it = m_storageAreaMap.begin(); it != end; ++it)
-        it->second->close();
-
-    if (m_syncManager)
-        m_syncManager->close();
-
-    m_isShutdown = true;
-}
-
-#ifdef ANDROID
-void StorageNamespaceImpl::clear(Page* page)
-{
-    ASSERT(isMainThread());
-    if (m_isShutdown)
-        return;
-
-    // Clear all the keys for each of the storage areas.
-    StorageAreaMap::iterator end = m_storageAreaMap.end();
-    for (StorageAreaMap::iterator it = m_storageAreaMap.begin(); it != end; ++it) {
-        // if there is no page provided, then the user tried to clear storage
-        // with only pages in private browsing mode open. So we do not need to
-        // provide a Frame* here (as the frame is only used to dispatch storage events
-        // and private browsing pages won't be using them).
-        it->second->clear(page ? page->mainFrame() : 0);
-    }
-}
-#endif
-
-void StorageNamespaceImpl::unlock()
-{
-    // Because there's a single event loop per-process, this is a no-op.
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)