[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bulach at chromium.org
bulach at chromium.org
Wed Dec 22 11:28:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a61830b12222ac1dfc6c404898e0ae3b35c2c4b6
Author: bulach at chromium.org <bulach at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 26 18:15:05 2010 +0000
2010-07-26 Marcus Bulach <bulach at chromium.org>
Reviewed by Jeremy Orlow.
Moves IDBKeyRange to use IDBKey rather than SerializedScriptValue / IDBAny.
https://bugs.webkit.org/show_bug.cgi?id=42583
Tests: existing storage/indexeddb/idb-keyrange.html must pass.
* storage/IDBKeyRange.cpp:
(WebCore::IDBKeyRange::IDBKeyRange):
* storage/IDBKeyRange.h:
(WebCore::IDBKeyRange::create):
(WebCore::IDBKeyRange::left):
(WebCore::IDBKeyRange::right):
* storage/IDBKeyRange.idl:
* storage/IndexedDatabaseRequest.cpp:
(WebCore::IndexedDatabaseRequest::makeSingleKeyRange):
(WebCore::IndexedDatabaseRequest::makeLeftBoundKeyRange):
(WebCore::IndexedDatabaseRequest::makeRightBoundKeyRange):
(WebCore::IndexedDatabaseRequest::makeBoundKeyRange):
* storage/IndexedDatabaseRequest.h:
* storage/IndexedDatabaseRequest.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 35208bb..d710585 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-07-26 Marcus Bulach <bulach at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Moves IDBKeyRange to use IDBKey rather than SerializedScriptValue / IDBAny.
+ https://bugs.webkit.org/show_bug.cgi?id=42583
+
+ Tests: existing storage/indexeddb/idb-keyrange.html must pass.
+
+ * storage/IDBKeyRange.cpp:
+ (WebCore::IDBKeyRange::IDBKeyRange):
+ * storage/IDBKeyRange.h:
+ (WebCore::IDBKeyRange::create):
+ (WebCore::IDBKeyRange::left):
+ (WebCore::IDBKeyRange::right):
+ * storage/IDBKeyRange.idl:
+ * storage/IndexedDatabaseRequest.cpp:
+ (WebCore::IndexedDatabaseRequest::makeSingleKeyRange):
+ (WebCore::IndexedDatabaseRequest::makeLeftBoundKeyRange):
+ (WebCore::IndexedDatabaseRequest::makeRightBoundKeyRange):
+ (WebCore::IndexedDatabaseRequest::makeBoundKeyRange):
+ * storage/IndexedDatabaseRequest.h:
+ * storage/IndexedDatabaseRequest.idl:
+
2010-07-26 Simon Fraser <simon.fraser at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebCore/storage/IDBKeyRange.cpp b/WebCore/storage/IDBKeyRange.cpp
index 9f22fc8..0b629bd 100644
--- a/WebCore/storage/IDBKeyRange.cpp
+++ b/WebCore/storage/IDBKeyRange.cpp
@@ -26,14 +26,13 @@
#include "config.h"
#include "IDBKeyRange.h"
-#include "IDBAny.h"
-#include "SerializedScriptValue.h"
+#include "IDBKey.h"
#if ENABLE(INDEXED_DATABASE)
namespace WebCore {
-IDBKeyRange::IDBKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags)
+IDBKeyRange::IDBKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags)
: m_left(left)
, m_right(right)
, m_flags(flags)
diff --git a/WebCore/storage/IDBKeyRange.h b/WebCore/storage/IDBKeyRange.h
index 52239e4..65f6996 100644
--- a/WebCore/storage/IDBKeyRange.h
+++ b/WebCore/storage/IDBKeyRange.h
@@ -28,8 +28,7 @@
#if ENABLE(INDEXED_DATABASE)
-#include "IDBAny.h"
-#include "SerializedScriptValue.h"
+#include "IDBKey.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -46,22 +45,22 @@ public:
RIGHT_BOUND = 8,
};
- static PassRefPtr<IDBKeyRange> create(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags)
+ static PassRefPtr<IDBKeyRange> create(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags)
{
return adoptRef(new IDBKeyRange(left, right, flags));
}
~IDBKeyRange() { }
- PassRefPtr<IDBAny> left() const { return IDBAny::create(m_left.get()); }
- PassRefPtr<IDBAny> right() const { return IDBAny::create(m_right.get()); }
+ PassRefPtr<IDBKey> left() const { return m_left; }
+ PassRefPtr<IDBKey> right() const { return m_right; }
unsigned short flags() const { return m_flags; }
private:
- IDBKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags);
+ IDBKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags);
- RefPtr<SerializedScriptValue> m_left;
- RefPtr<SerializedScriptValue> m_right;
+ RefPtr<IDBKey> m_left;
+ RefPtr<IDBKey> m_right;
unsigned short m_flags;
};
diff --git a/WebCore/storage/IDBKeyRange.idl b/WebCore/storage/IDBKeyRange.idl
index 05f6505..d018fed 100644
--- a/WebCore/storage/IDBKeyRange.idl
+++ b/WebCore/storage/IDBKeyRange.idl
@@ -35,8 +35,8 @@ module storage {
const unsigned short LEFT_BOUND = 4;
const unsigned short RIGHT_BOUND = 8;
- readonly attribute IDBAny left;
- readonly attribute IDBAny right;
+ readonly attribute IDBKey left;
+ readonly attribute IDBKey right;
readonly attribute unsigned short flags;
};
diff --git a/WebCore/storage/IndexedDatabaseRequest.cpp b/WebCore/storage/IndexedDatabaseRequest.cpp
index 45ae1bd..7f3ab5a 100644
--- a/WebCore/storage/IndexedDatabaseRequest.cpp
+++ b/WebCore/storage/IndexedDatabaseRequest.cpp
@@ -68,23 +68,23 @@ PassRefPtr<IDBRequest> IndexedDatabaseRequest::open(ScriptExecutionContext* cont
return request;
}
-PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeSingleKeyRange(PassRefPtr<SerializedScriptValue> prpValue)
+PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeSingleKeyRange(PassRefPtr<IDBKey> prpValue)
{
- RefPtr<SerializedScriptValue> value = prpValue;
+ RefPtr<IDBKey> value = prpValue;
return IDBKeyRange::create(value, value, IDBKeyRange::SINGLE);
}
-PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeLeftBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open)
+PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeLeftBoundKeyRange(PassRefPtr<IDBKey> bound, bool open)
{
- return IDBKeyRange::create(bound, SerializedScriptValue::create(), open ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND);
+ return IDBKeyRange::create(bound, IDBKey::create(), open ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND);
}
-PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeRightBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open)
+PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeRightBoundKeyRange(PassRefPtr<IDBKey> bound, bool open)
{
- return IDBKeyRange::create(SerializedScriptValue::create(), bound, open ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND);
+ return IDBKeyRange::create(IDBKey::create(), bound, open ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND);
}
-PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeBoundKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, bool openLeft, bool openRight)
+PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeBoundKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, bool openLeft, bool openRight)
{
unsigned short flags = openLeft ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND;
flags |= openRight ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND;
diff --git a/WebCore/storage/IndexedDatabaseRequest.h b/WebCore/storage/IndexedDatabaseRequest.h
index f505d9d..de01b35 100644
--- a/WebCore/storage/IndexedDatabaseRequest.h
+++ b/WebCore/storage/IndexedDatabaseRequest.h
@@ -39,12 +39,11 @@
namespace WebCore {
-class IDBAny;
+class IDBKey;
class IDBKeyRange;
class IDBRequest;
class IndexedDatabase;
class ScriptExecutionContext;
-class SerializedScriptValue;
class IndexedDatabaseRequest : public RefCounted<IndexedDatabaseRequest> {
public:
@@ -55,10 +54,10 @@ public:
~IndexedDatabaseRequest();
PassRefPtr<IDBRequest> open(ScriptExecutionContext*, const String& name, const String& description);
- PassRefPtr<IDBKeyRange> makeSingleKeyRange(PassRefPtr<SerializedScriptValue> value);
- PassRefPtr<IDBKeyRange> makeLeftBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open = false);
- PassRefPtr<IDBKeyRange> makeRightBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open = false);
- PassRefPtr<IDBKeyRange> makeBoundKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, bool openLeft = false, bool openRight = false);
+ PassRefPtr<IDBKeyRange> makeSingleKeyRange(PassRefPtr<IDBKey> value);
+ PassRefPtr<IDBKeyRange> makeLeftBoundKeyRange(PassRefPtr<IDBKey> bound, bool open = false);
+ PassRefPtr<IDBKeyRange> makeRightBoundKeyRange(PassRefPtr<IDBKey> bound, bool open = false);
+ PassRefPtr<IDBKeyRange> makeBoundKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, bool openLeft = false, bool openRight = false);
private:
IndexedDatabaseRequest(IndexedDatabase*);
diff --git a/WebCore/storage/IndexedDatabaseRequest.idl b/WebCore/storage/IndexedDatabaseRequest.idl
index 502e804..a3249c0 100644
--- a/WebCore/storage/IndexedDatabaseRequest.idl
+++ b/WebCore/storage/IndexedDatabaseRequest.idl
@@ -29,10 +29,10 @@ module storage {
Conditional=INDEXED_DATABASE
] IndexedDatabaseRequest {
[CallWith=ScriptExecutionContext] IDBRequest open(in DOMString name, in DOMString description);
- IDBKeyRange makeSingleKeyRange(in SerializedScriptValue value);
- IDBKeyRange makeLeftBoundKeyRange(in SerializedScriptValue bound, in [Optional] boolean open);
- IDBKeyRange makeRightBoundKeyRange(in SerializedScriptValue bound, in [Optional] boolean open);
- IDBKeyRange makeBoundKeyRange(in SerializedScriptValue left, in SerializedScriptValue right, in [Optional] boolean openLeft, in [Optional] boolean openRight);
+ IDBKeyRange makeSingleKeyRange(in IDBKey value);
+ IDBKeyRange makeLeftBoundKeyRange(in IDBKey bound, in [Optional] boolean open);
+ IDBKeyRange makeRightBoundKeyRange(in IDBKey bound, in [Optional] boolean open);
+ IDBKeyRange makeBoundKeyRange(in IDBKey left, in IDBKey right, in [Optional] boolean openLeft, in [Optional] boolean openRight);
};
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list