Changeset 64055 in webkit
- Timestamp:
- Jul 26, 2010 11:15:05 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r64054 r64055 1 2010-07-26 Marcus Bulach <bulach@chromium.org> 2 3 Reviewed by Jeremy Orlow. 4 5 Moves IDBKeyRange to use IDBKey rather than SerializedScriptValue / IDBAny. 6 https://bugs.webkit.org/show_bug.cgi?id=42583 7 8 Tests: existing storage/indexeddb/idb-keyrange.html must pass. 9 10 * storage/IDBKeyRange.cpp: 11 (WebCore::IDBKeyRange::IDBKeyRange): 12 * storage/IDBKeyRange.h: 13 (WebCore::IDBKeyRange::create): 14 (WebCore::IDBKeyRange::left): 15 (WebCore::IDBKeyRange::right): 16 * storage/IDBKeyRange.idl: 17 * storage/IndexedDatabaseRequest.cpp: 18 (WebCore::IndexedDatabaseRequest::makeSingleKeyRange): 19 (WebCore::IndexedDatabaseRequest::makeLeftBoundKeyRange): 20 (WebCore::IndexedDatabaseRequest::makeRightBoundKeyRange): 21 (WebCore::IndexedDatabaseRequest::makeBoundKeyRange): 22 * storage/IndexedDatabaseRequest.h: 23 * storage/IndexedDatabaseRequest.idl: 24 1 25 2010-07-26 Simon Fraser <simon.fraser@apple.com> 2 26 -
trunk/WebCore/storage/IDBKeyRange.cpp
r63211 r64055 27 27 #include "IDBKeyRange.h" 28 28 29 #include "IDBAny.h" 30 #include "SerializedScriptValue.h" 29 #include "IDBKey.h" 31 30 32 31 #if ENABLE(INDEXED_DATABASE) … … 34 33 namespace WebCore { 35 34 36 IDBKeyRange::IDBKeyRange(PassRefPtr< SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags)35 IDBKeyRange::IDBKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags) 37 36 : m_left(left) 38 37 , m_right(right) -
trunk/WebCore/storage/IDBKeyRange.h
r63211 r64055 29 29 #if ENABLE(INDEXED_DATABASE) 30 30 31 #include "IDBAny.h" 32 #include "SerializedScriptValue.h" 31 #include "IDBKey.h" 33 32 #include <wtf/PassRefPtr.h> 34 33 #include <wtf/RefCounted.h> … … 47 46 }; 48 47 49 static PassRefPtr<IDBKeyRange> create(PassRefPtr< SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags)48 static PassRefPtr<IDBKeyRange> create(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags) 50 49 { 51 50 return adoptRef(new IDBKeyRange(left, right, flags)); … … 54 53 55 54 56 PassRefPtr<IDB Any> left() const { return IDBAny::create(m_left.get()); }57 PassRefPtr<IDB Any> right() const { return IDBAny::create(m_right.get()); }55 PassRefPtr<IDBKey> left() const { return m_left; } 56 PassRefPtr<IDBKey> right() const { return m_right; } 58 57 unsigned short flags() const { return m_flags; } 59 58 60 59 private: 61 IDBKeyRange(PassRefPtr< SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags);60 IDBKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags); 62 61 63 RefPtr< SerializedScriptValue> m_left;64 RefPtr< SerializedScriptValue> m_right;62 RefPtr<IDBKey> m_left; 63 RefPtr<IDBKey> m_right; 65 64 unsigned short m_flags; 66 65 }; -
trunk/WebCore/storage/IDBKeyRange.idl
r61120 r64055 36 36 const unsigned short RIGHT_BOUND = 8; 37 37 38 readonly attribute IDB Any left;39 readonly attribute IDB Any right;38 readonly attribute IDBKey left; 39 readonly attribute IDBKey right; 40 40 readonly attribute unsigned short flags; 41 41 }; -
trunk/WebCore/storage/IndexedDatabaseRequest.cpp
r63211 r64055 69 69 } 70 70 71 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeSingleKeyRange(PassRefPtr< SerializedScriptValue> prpValue)71 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeSingleKeyRange(PassRefPtr<IDBKey> prpValue) 72 72 { 73 RefPtr< SerializedScriptValue> value = prpValue;73 RefPtr<IDBKey> value = prpValue; 74 74 return IDBKeyRange::create(value, value, IDBKeyRange::SINGLE); 75 75 } 76 76 77 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeLeftBoundKeyRange(PassRefPtr< SerializedScriptValue> bound, bool open)77 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeLeftBoundKeyRange(PassRefPtr<IDBKey> bound, bool open) 78 78 { 79 return IDBKeyRange::create(bound, SerializedScriptValue::create(), open ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND);79 return IDBKeyRange::create(bound, IDBKey::create(), open ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND); 80 80 } 81 81 82 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeRightBoundKeyRange(PassRefPtr< SerializedScriptValue> bound, bool open)82 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeRightBoundKeyRange(PassRefPtr<IDBKey> bound, bool open) 83 83 { 84 return IDBKeyRange::create( SerializedScriptValue::create(), bound, open ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND);84 return IDBKeyRange::create(IDBKey::create(), bound, open ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND); 85 85 } 86 86 87 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeBoundKeyRange(PassRefPtr< SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, bool openLeft, bool openRight)87 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeBoundKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, bool openLeft, bool openRight) 88 88 { 89 89 unsigned short flags = openLeft ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND; -
trunk/WebCore/storage/IndexedDatabaseRequest.h
r63211 r64055 40 40 namespace WebCore { 41 41 42 class IDB Any;42 class IDBKey; 43 43 class IDBKeyRange; 44 44 class IDBRequest; 45 45 class IndexedDatabase; 46 46 class ScriptExecutionContext; 47 class SerializedScriptValue;48 47 49 48 class IndexedDatabaseRequest : public RefCounted<IndexedDatabaseRequest> { … … 56 55 57 56 PassRefPtr<IDBRequest> open(ScriptExecutionContext*, const String& name, const String& description); 58 PassRefPtr<IDBKeyRange> makeSingleKeyRange(PassRefPtr< SerializedScriptValue> value);59 PassRefPtr<IDBKeyRange> makeLeftBoundKeyRange(PassRefPtr< SerializedScriptValue> bound, bool open = false);60 PassRefPtr<IDBKeyRange> makeRightBoundKeyRange(PassRefPtr< SerializedScriptValue> bound, bool open = false);61 PassRefPtr<IDBKeyRange> makeBoundKeyRange(PassRefPtr< SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, bool openLeft = false, bool openRight = false);57 PassRefPtr<IDBKeyRange> makeSingleKeyRange(PassRefPtr<IDBKey> value); 58 PassRefPtr<IDBKeyRange> makeLeftBoundKeyRange(PassRefPtr<IDBKey> bound, bool open = false); 59 PassRefPtr<IDBKeyRange> makeRightBoundKeyRange(PassRefPtr<IDBKey> bound, bool open = false); 60 PassRefPtr<IDBKeyRange> makeBoundKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, bool openLeft = false, bool openRight = false); 62 61 63 62 private: -
trunk/WebCore/storage/IndexedDatabaseRequest.idl
r61120 r64055 30 30 ] IndexedDatabaseRequest { 31 31 [CallWith=ScriptExecutionContext] IDBRequest open(in DOMString name, in DOMString description); 32 IDBKeyRange makeSingleKeyRange(in SerializedScriptValuevalue);33 IDBKeyRange makeLeftBoundKeyRange(in SerializedScriptValuebound, in [Optional] boolean open);34 IDBKeyRange makeRightBoundKeyRange(in SerializedScriptValuebound, in [Optional] boolean open);35 IDBKeyRange makeBoundKeyRange(in SerializedScriptValue left, in SerializedScriptValueright, in [Optional] boolean openLeft, in [Optional] boolean openRight);32 IDBKeyRange makeSingleKeyRange(in IDBKey value); 33 IDBKeyRange makeLeftBoundKeyRange(in IDBKey bound, in [Optional] boolean open); 34 IDBKeyRange makeRightBoundKeyRange(in IDBKey bound, in [Optional] boolean open); 35 IDBKeyRange makeBoundKeyRange(in IDBKey left, in IDBKey right, in [Optional] boolean openLeft, in [Optional] boolean openRight); 36 36 }; 37 37
Note: See TracChangeset
for help on using the changeset viewer.