| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 return nullptr; | 233 return nullptr; |
| 234 } | 234 } |
| 235 IDBKey* subkey = createIDBKeyFromValue( | 235 IDBKey* subkey = createIDBKeyFromValue( |
| 236 isolate, item, stack, exceptionState, allowExperimentalTypes); | 236 isolate, item, stack, exceptionState, allowExperimentalTypes); |
| 237 if (!subkey) | 237 if (!subkey) |
| 238 subkeys.append(IDBKey::createInvalid()); | 238 subkeys.append(IDBKey::createInvalid()); |
| 239 else | 239 else |
| 240 subkeys.append(subkey); | 240 subkeys.append(subkey); |
| 241 } | 241 } |
| 242 | 242 |
| 243 stack.removeLast(); | 243 stack.pop_back(); |
| 244 return IDBKey::createArray(subkeys); | 244 return IDBKey::createArray(subkeys); |
| 245 } | 245 } |
| 246 return nullptr; | 246 return nullptr; |
| 247 } | 247 } |
| 248 | 248 |
| 249 static IDBKey* createIDBKeyFromValue(v8::Isolate* isolate, | 249 static IDBKey* createIDBKeyFromValue(v8::Isolate* isolate, |
| 250 v8::Local<v8::Value> value, | 250 v8::Local<v8::Value> value, |
| 251 ExceptionState& exceptionState, | 251 ExceptionState& exceptionState, |
| 252 bool allowExperimentalTypes = false) { | 252 bool allowExperimentalTypes = false) { |
| 253 Vector<v8::Local<v8::Array>> stack; | 253 Vector<v8::Local<v8::Array>> stack; |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 if (expectedKey && expectedKey->isEqual(value->primaryKey())) | 617 if (expectedKey && expectedKey->isEqual(value->primaryKey())) |
| 618 return; | 618 return; |
| 619 | 619 |
| 620 bool injected = injectV8KeyIntoV8Value( | 620 bool injected = injectV8KeyIntoV8Value( |
| 621 isolate, keyValue.v8Value(), scriptValue.v8Value(), value->keyPath()); | 621 isolate, keyValue.v8Value(), scriptValue.v8Value(), value->keyPath()); |
| 622 DCHECK(injected); | 622 DCHECK(injected); |
| 623 } | 623 } |
| 624 #endif | 624 #endif |
| 625 | 625 |
| 626 } // namespace blink | 626 } // namespace blink |
| OLD | NEW |