| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 static v8::Local<v8::Value> deserializeIDBValueData(v8::Isolate* isolate, | 382 static v8::Local<v8::Value> deserializeIDBValueData(v8::Isolate* isolate, |
| 383 const IDBValue* value) { | 383 const IDBValue* value) { |
| 384 ASSERT(isolate->InContext()); | 384 ASSERT(isolate->InContext()); |
| 385 if (!value || value->isNull()) | 385 if (!value || value->isNull()) |
| 386 return v8::Null(isolate); | 386 return v8::Null(isolate); |
| 387 | 387 |
| 388 RefPtr<SerializedScriptValue> serializedValue = | 388 RefPtr<SerializedScriptValue> serializedValue = |
| 389 value->createSerializedValue(); | 389 value->createSerializedValue(); |
| 390 SerializedScriptValue::DeserializeOptions options; | 390 SerializedScriptValue::DeserializeOptions options; |
| 391 options.blobInfo = value->blobInfo(); | 391 options.blobInfo = value->blobInfo(); |
| 392 options.readWasmFromStream = true; |
| 392 return serializedValue->deserialize(isolate, options); | 393 return serializedValue->deserialize(isolate, options); |
| 393 } | 394 } |
| 394 | 395 |
| 395 // Deserialize the entire IDBValue (injecting key & keypath if present). | 396 // Deserialize the entire IDBValue (injecting key & keypath if present). |
| 396 static v8::Local<v8::Value> deserializeIDBValue( | 397 static v8::Local<v8::Value> deserializeIDBValue( |
| 397 v8::Isolate* isolate, | 398 v8::Isolate* isolate, |
| 398 v8::Local<v8::Object> creationContext, | 399 v8::Local<v8::Object> creationContext, |
| 399 const IDBValue* value) { | 400 const IDBValue* value) { |
| 400 ASSERT(isolate->InContext()); | 401 ASSERT(isolate->InContext()); |
| 401 if (!value || value->isNull()) | 402 if (!value || value->isNull()) |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 if (expectedKey && expectedKey->isEqual(value->primaryKey())) | 609 if (expectedKey && expectedKey->isEqual(value->primaryKey())) |
| 609 return; | 610 return; |
| 610 | 611 |
| 611 bool injected = injectV8KeyIntoV8Value( | 612 bool injected = injectV8KeyIntoV8Value( |
| 612 isolate, keyValue.v8Value(), scriptValue.v8Value(), value->keyPath()); | 613 isolate, keyValue.v8Value(), scriptValue.v8Value(), value->keyPath()); |
| 613 DCHECK(injected); | 614 DCHECK(injected); |
| 614 } | 615 } |
| 615 #endif | 616 #endif |
| 616 | 617 |
| 617 } // namespace blink | 618 } // namespace blink |
| OLD | NEW |