[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreip at google.com
andreip at google.com
Wed Dec 22 14:43:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 157747d16edee3188ded8d3e562ba0460b9c8a8d
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 18 16:35:27 2010 +0000
2010-10-18 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
IDBKeyTree.h is no longer used.
https://bugs.webkit.org/show_bug.cgi?id=47824
No new tests, just removing unused files.
* WebCore.gypi:
* WebCore.xcodeproj/project.pbxproj:
* storage/IDBKeyTree.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69964 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5567a4a..4f08d7a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-18 Andrei Popescu <andreip at google.com>
+
+ Reviewed by Jeremy Orlow.
+
+ IDBKeyTree.h is no longer used.
+ https://bugs.webkit.org/show_bug.cgi?id=47824
+
+ No new tests, just removing unused files.
+
+ * WebCore.gypi:
+ * WebCore.xcodeproj/project.pbxproj:
+ * storage/IDBKeyTree.h: Removed.
+
2010-10-18 Andreas Kling <kling at webkit.org>
Unreviewed buildfix for Qt + V8.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 7880606..7bbf85f 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3833,7 +3833,6 @@
'storage/IDBKeyPath.h',
'storage/IDBKeyRange.cpp',
'storage/IDBKeyRange.h',
- 'storage/IDBKeyTree.h',
'storage/IDBObjectStore.cpp',
'storage/IDBObjectStore.h',
'storage/IDBObjectStoreBackendImpl.cpp',
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index c323c94..6266452 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5228,7 +5228,6 @@
C585A6E711D4FB3D004C3E4B /* IDBKey.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B311D4FB3D004C3E4B /* IDBKey.h */; };
C585A6E911D4FB3D004C3E4B /* IDBKeyRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6B511D4FB3D004C3E4B /* IDBKeyRange.cpp */; };
C585A6EA11D4FB3D004C3E4B /* IDBKeyRange.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B611D4FB3D004C3E4B /* IDBKeyRange.h */; };
- C585A6EC11D4FB3D004C3E4B /* IDBKeyTree.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B811D4FB3D004C3E4B /* IDBKeyTree.h */; };
C585A6ED11D4FB3D004C3E4B /* IDBObjectStore.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B911D4FB3D004C3E4B /* IDBObjectStore.h */; };
C585A6EE11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp */; };
C585A6EF11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h */; };
@@ -11221,7 +11220,6 @@
C585A6B511D4FB3D004C3E4B /* IDBKeyRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKeyRange.cpp; sourceTree = "<group>"; };
C585A6B611D4FB3D004C3E4B /* IDBKeyRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKeyRange.h; sourceTree = "<group>"; };
C585A6B711D4FB3D004C3E4B /* IDBKeyRange.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBKeyRange.idl; sourceTree = "<group>"; };
- C585A6B811D4FB3D004C3E4B /* IDBKeyTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKeyTree.h; sourceTree = "<group>"; };
C585A6B911D4FB3D004C3E4B /* IDBObjectStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStore.h; sourceTree = "<group>"; };
C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBObjectStoreBackendImpl.cpp; sourceTree = "<group>"; };
C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStoreBackendImpl.h; sourceTree = "<group>"; };
@@ -12050,7 +12048,6 @@
C585A6B511D4FB3D004C3E4B /* IDBKeyRange.cpp */,
C585A6B611D4FB3D004C3E4B /* IDBKeyRange.h */,
C585A6B711D4FB3D004C3E4B /* IDBKeyRange.idl */,
- C585A6B811D4FB3D004C3E4B /* IDBKeyTree.h */,
C585A6BC11D4FB3D004C3E4B /* IDBObjectStore.cpp */,
C585A6B911D4FB3D004C3E4B /* IDBObjectStore.h */,
C585A6BE11D4FB3D004C3E4B /* IDBObjectStore.idl */,
@@ -19620,7 +19617,6 @@
C572EE0F1201C736007D8F82 /* IDBIndexBackendInterface.h in Headers */,
C585A6E711D4FB3D004C3E4B /* IDBKey.h in Headers */,
C585A6EA11D4FB3D004C3E4B /* IDBKeyRange.h in Headers */,
- C585A6EC11D4FB3D004C3E4B /* IDBKeyTree.h in Headers */,
C585A6ED11D4FB3D004C3E4B /* IDBObjectStore.h in Headers */,
C585A6EF11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h in Headers */,
C585A6F111D4FB3D004C3E4B /* IDBObjectStoreBackendInterface.h in Headers */,
diff --git a/WebCore/storage/IDBKeyTree.h b/WebCore/storage/IDBKeyTree.h
deleted file mode 100644
index 70d6f83..0000000
--- a/WebCore/storage/IDBKeyTree.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef IDBKeyTree_h
-#define IDBKeyTree_h
-
-#if ENABLE(INDEXED_DATABASE)
-
-#include "IDBKey.h"
-#include <wtf/AVLTree.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-template <typename ValueType>
-class IDBKeyTree : public RefCounted<IDBKeyTree<ValueType> > {
-public:
- static PassRefPtr<IDBKeyTree> create()
- {
- return adoptRef(new IDBKeyTree());
- }
- ~IDBKeyTree();
-
- ValueType* get(IDBKey* key);
- void put(IDBKey* key, ValueType* value);
- void remove(IDBKey* key);
-
-private:
- struct TreeNode {
- RefPtr<ValueType> value;
- RefPtr<IDBKey> key;
-
- TreeNode* less;
- TreeNode* greater;
- int balanceFactor;
- };
-
- struct AVLTreeAbstractor {
- typedef TreeNode* handle;
- typedef size_t size;
- typedef IDBKey* key;
-
- handle get_less(handle h) { return h->less; }
- void set_less(handle h, handle lh) { h->less = lh; }
- handle get_greater(handle h) { return h->greater; }
- void set_greater(handle h, handle gh) { h->greater = gh; }
- int get_balance_factor(handle h) { return h->balanceFactor; }
- void set_balance_factor(handle h, int bf) { h->balanceFactor = bf; }
-
- static handle null() { return 0; }
-
- int compare_key_key(key va, key vb);
- int compare_key_node(key k, handle h) { return compare_key_key(k, h->key.get()); }
- int compare_node_node(handle h1, handle h2) { return compare_key_key(h1->key.get(), h2->key.get()); }
- };
-
- IDBKeyTree();
-
- typedef WTF::AVLTree<AVLTreeAbstractor> TreeType;
- TreeType m_tree;
-};
-
-template <typename ValueType>
-IDBKeyTree<ValueType>::IDBKeyTree()
-{
-}
-
-template <typename ValueType>
-IDBKeyTree<ValueType>::~IDBKeyTree()
-{
- typename TreeType::Iterator iter;
- iter.start_iter_least(m_tree);
- for (; *iter; ++iter)
- delete *iter;
- m_tree.purge();
-}
-
-template <typename ValueType>
-int IDBKeyTree<ValueType>::AVLTreeAbstractor::compare_key_key(key va, key vb)
-{
- if (va->type() != vb->type())
- return vb->type() - va->type();
-
- switch (va->type()) {
- case IDBKey::NullType:
- return 0;
- case IDBKey::NumberType:
- return vb->number() - va->number();
- case IDBKey::StringType:
- return codePointCompare(va->string(), vb->string());
- // FIXME: Handle dates. Oh, and test this thoroughly.
- default:
- ASSERT_NOT_REACHED();
- return 0;
- }
-}
-
-template <typename ValueType>
-ValueType* IDBKeyTree<ValueType>::get(IDBKey* key)
-{
- TreeNode* node = m_tree.search(key);
- if (!node)
- return 0;
- return node->value.get();
-}
-
-template <typename ValueType>
-void IDBKeyTree<ValueType>::put(IDBKey* key, ValueType* value)
-{
- TreeNode* node = m_tree.search(key);
- if (!node) {
- node = new TreeNode();
- node->key = key;
- m_tree.insert(node);
- }
- node->value = value;
-}
-
-template <typename ValueType>
-void IDBKeyTree<ValueType>::remove(IDBKey* key)
-{
- TreeNode* node = m_tree.remove(key);
- if (node)
- delete node;
-}
-
-}
-
-#endif // ENABLE(INDEXED_DATABASE)
-
-#endif // IDBKeyTree_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list