Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 /* | 1 /* | 
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 
| 3 * | 3 * | 
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without | 
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are | 
| 6 * met: | 6 * met: | 
| 7 * | 7 * | 
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright | 
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. | 
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above | 
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 372 { | 372 { | 
| 373 if (error) { | 373 if (error) { | 
| 374 console.error("IndexedDBAgent error: " + error); | 374 console.error("IndexedDBAgent error: " + error); | 
| 375 return; | 375 return; | 
| 376 } | 376 } | 
| 377 | 377 | 
| 378 if (!this._databaseNamesBySecurityOrigin[databaseId.securityOrigin]) | 378 if (!this._databaseNamesBySecurityOrigin[databaseId.securityOrigin]) | 
| 379 return; | 379 return; | 
| 380 var entries = []; | 380 var entries = []; | 
| 381 for (var i = 0; i < dataEntries.length; ++i) { | 381 for (var i = 0; i < dataEntries.length; ++i) { | 
| 382 var key = WebInspector.RemoteObject.fromPayload(dataEntries[i].k ey); | 382 var key = WebInspector.RemoteObject.fromLocalObject(JSON.parse(d ataEntries[i].key)); | 
| 
 
vsevik
2014/06/04 05:48:32
Now that we use LocalObject instead of RemoteObjec
 
 | |
| 383 var primaryKey = WebInspector.RemoteObject.fromPayload(dataEntri es[i].primaryKey); | 383 var primaryKey = WebInspector.RemoteObject.fromLocalObject(JSON. parse(dataEntries[i].primaryKey)); | 
| 384 var value = WebInspector.RemoteObject.fromPayload(dataEntries[i] .value); | 384 var value = WebInspector.RemoteObject.fromLocalObject(JSON.parse (dataEntries[i].value)); | 
| 385 entries.push(new WebInspector.IndexedDBModel.Entry(key, primaryK ey, value)); | 385 entries.push(new WebInspector.IndexedDBModel.Entry(key, primaryK ey, value)); | 
| 386 } | 386 } | 
| 387 callback(entries, hasMore); | 387 callback(entries, hasMore); | 
| 388 } | 388 } | 
| 389 | 389 | 
| 390 var keyRange = WebInspector.IndexedDBModel.keyRangeFromIDBKeyRange(idbKe yRange); | 390 var keyRange = WebInspector.IndexedDBModel.keyRangeFromIDBKeyRange(idbKe yRange); | 
| 391 IndexedDBAgent.requestData(databaseId.securityOrigin, databaseName, obje ctStoreName, indexName, skipCount, pageSize, keyRange ? keyRange : undefined, in nerCallback.bind(this)); | 391 IndexedDBAgent.requestData(databaseId.securityOrigin, databaseName, obje ctStoreName, indexName, skipCount, pageSize, keyRange ? keyRange : undefined, in nerCallback.bind(this)); | 
| 392 }, | 392 }, | 
| 393 | 393 | 
| 394 __proto__: WebInspector.Object.prototype | 394 __proto__: WebInspector.Object.prototype | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 479 | 479 | 
| 480 WebInspector.IndexedDBModel.Index.prototype = { | 480 WebInspector.IndexedDBModel.Index.prototype = { | 
| 481 /** | 481 /** | 
| 482 * @type {string} | 482 * @type {string} | 
| 483 */ | 483 */ | 
| 484 get keyPathString() | 484 get keyPathString() | 
| 485 { | 485 { | 
| 486 return WebInspector.IndexedDBModel.keyPathStringFromIDBKeyPath(this.keyP ath); | 486 return WebInspector.IndexedDBModel.keyPathStringFromIDBKeyPath(this.keyP ath); | 
| 487 } | 487 } | 
| 488 } | 488 } | 
| OLD | NEW |