| Index: third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp b/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
|
| index c2b3db184dff0d6b39b4879d7cabed9b32bf6cbf..a118671f510c985be50b60fe0078762a935952c6 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
|
| @@ -393,7 +393,7 @@ static IDBKey* idbKeyFromInspectorObject(PassOwnPtr<protocol::IndexedDB::Key> ke
|
| return idbKey;
|
| }
|
|
|
| -static IDBKeyRange* idbKeyRangeFromKeyRange(PassOwnPtr<protocol::IndexedDB::KeyRange> keyRange)
|
| +static IDBKeyRange* idbKeyRangeFromKeyRange(protocol::IndexedDB::KeyRange* keyRange)
|
| {
|
| IDBKey* idbLower = idbKeyFromInspectorObject(keyRange->getLower(nullptr));
|
| if (keyRange->hasLower() && !idbLower)
|
| @@ -686,7 +686,15 @@ void InspectorIndexedDBAgent::requestDatabase(ErrorString* errorString, const St
|
| databaseLoader->start(idbFactory, document->securityOrigin(), databaseName);
|
| }
|
|
|
| -void InspectorIndexedDBAgent::requestData(ErrorString* errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, PassOwnPtr<protocol::IndexedDB::KeyRange> keyRange, const PassRefPtr<RequestDataCallback> requestCallback)
|
| +void InspectorIndexedDBAgent::requestData(ErrorString* errorString,
|
| + const String& securityOrigin,
|
| + const String& databaseName,
|
| + const String& objectStoreName,
|
| + const String& indexName,
|
| + int skipCount,
|
| + int pageSize,
|
| + const Maybe<protocol::IndexedDB::KeyRange>& keyRange,
|
| + const PassRefPtr<RequestDataCallback> requestCallback)
|
| {
|
| LocalFrame* frame = m_inspectedFrames->frameWithSecurityOrigin(securityOrigin);
|
| Document* document = assertDocument(errorString, frame);
|
| @@ -696,8 +704,8 @@ void InspectorIndexedDBAgent::requestData(ErrorString* errorString, const String
|
| if (!idbFactory)
|
| return;
|
|
|
| - IDBKeyRange* idbKeyRange = keyRange ? idbKeyRangeFromKeyRange(keyRange) : nullptr;
|
| - if (keyRange && !idbKeyRange) {
|
| + IDBKeyRange* idbKeyRange = keyRange.isJust() ? idbKeyRangeFromKeyRange(keyRange.fromJust()) : nullptr;
|
| + if (keyRange.isJust() && !idbKeyRange) {
|
| *errorString = "Can not parse key range.";
|
| return;
|
| }
|
|
|