Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 0 insertions, 93 deletions

diff --git a/Source/WebKit/chromium/src/WebIDBMetadata.cpp b/Source/WebKit/chromium/src/WebIDBMetadata.cpp
deleted file mode 100644
index 2ca5bf7c7..000000000
--- a/Source/WebKit/chromium/src/WebIDBMetadata.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2012 Google 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 AND ITS CONTRIBUTORS "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 OR ITS 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 "WebIDBMetadata.h"
-
-#if ENABLE(INDEXED_DATABASE)
-
-#include "IDBMetadata.h"
-#include "WebIDBKeyPath.h"
-#include "platform/WebString.h"
-#include <public/WebVector.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebIDBMetadata::WebIDBMetadata(const WebCore::IDBDatabaseMetadata& metadata)
-{
-    name = metadata.name;
-    version = metadata.version;
-    intVersion = metadata.intVersion;
-    objectStores = WebVector<ObjectStore>(static_cast<size_t>(metadata.objectStores.size()));
-    maxObjectStoreId = metadata.maxObjectStoreId;
-
-    size_t i = 0;
-    for (IDBDatabaseMetadata::ObjectStoreMap::const_iterator storeIterator = metadata.objectStores.begin(); storeIterator != metadata.objectStores.end(); ++storeIterator) {
-        const IDBObjectStoreMetadata& objectStore = storeIterator->value;
-        ObjectStore webObjectStore;
-        webObjectStore.id = objectStore.id;
-        webObjectStore.name = objectStore.name;
-        webObjectStore.keyPath = objectStore.keyPath;
-        webObjectStore.autoIncrement = objectStore.autoIncrement;
-        webObjectStore.indexes = WebVector<Index>(static_cast<size_t>(objectStore.indexes.size()));
-        webObjectStore.maxIndexId = objectStore.maxIndexId;
-
-        size_t j = 0;
-        for (IDBObjectStoreMetadata::IndexMap::const_iterator indexIterator = objectStore.indexes.begin(); indexIterator != objectStore.indexes.end(); ++indexIterator) {
-            const IDBIndexMetadata& index = indexIterator->value;
-            Index webIndex;
-            webIndex.id = index.id;
-            webIndex.name = index.name;
-            webIndex.keyPath = index.keyPath;
-            webIndex.unique = index.unique;
-            webIndex.multiEntry = index.multiEntry;
-            webObjectStore.indexes[j++] = webIndex;
-        }
-        objectStores[i++] = webObjectStore;
-    }
-}
-
-WebIDBMetadata::operator IDBDatabaseMetadata() const
-{
-    IDBDatabaseMetadata db(name, id, version, intVersion, maxObjectStoreId);
-    for (size_t i = 0; i < objectStores.size(); ++i) {
-        const ObjectStore webObjectStore = objectStores[i];
-        IDBObjectStoreMetadata objectStore(webObjectStore.name, webObjectStore.id, webObjectStore.keyPath, webObjectStore.autoIncrement, webObjectStore.maxIndexId);
-
-        for (size_t j = 0; j < webObjectStore.indexes.size(); ++j) {
-            const Index webIndex = webObjectStore.indexes[j];
-            IDBIndexMetadata index(webIndex.name, webIndex.id, webIndex.keyPath, webIndex.unique, webIndex.multiEntry);
-            objectStore.indexes.set(index.id, index);
-        }
-        db.objectStores.set(objectStore.id, objectStore);
-    }
-    return db;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(INDEXED_DATABASE)