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 25 matching lines...) Expand all Loading... |
36 | 36 |
37 using namespace blink; | 37 using namespace blink; |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 IDBKey* checkKeyFromValueAndKeyPathInternal(v8::Isolate* isolate, const ScriptVa
lue& value, const String& keyPath) | 41 IDBKey* checkKeyFromValueAndKeyPathInternal(v8::Isolate* isolate, const ScriptVa
lue& value, const String& keyPath) |
42 { | 42 { |
43 IDBKeyPath idbKeyPath(keyPath); | 43 IDBKeyPath idbKeyPath(keyPath); |
44 EXPECT_TRUE(idbKeyPath.isValid()); | 44 EXPECT_TRUE(idbKeyPath.isValid()); |
45 | 45 |
46 return createIDBKeyFromScriptValueAndKeyPath(isolate, value, idbKeyPath); | 46 NonThrowableExceptionState exceptionState; |
| 47 return ScriptValue::to<IDBKey*>(isolate, value, exceptionState, idbKeyPath); |
47 } | 48 } |
48 | 49 |
49 void checkKeyPathNullValue(v8::Isolate* isolate, const ScriptValue& value, const
String& keyPath) | 50 void checkKeyPathNullValue(v8::Isolate* isolate, const ScriptValue& value, const
String& keyPath) |
50 { | 51 { |
51 ASSERT_FALSE(checkKeyFromValueAndKeyPathInternal(isolate, value, keyPath)); | 52 ASSERT_FALSE(checkKeyFromValueAndKeyPathInternal(isolate, value, keyPath)); |
52 } | 53 } |
53 | 54 |
54 bool injectKey(ScriptState* scriptState, IDBKey* key, ScriptValue& value, const
String& keyPath) | 55 bool injectKey(ScriptState* scriptState, IDBKey* key, ScriptValue& value, const
String& keyPath) |
55 { | 56 { |
56 IDBKeyPath idbKeyPath(keyPath); | 57 IDBKeyPath idbKeyPath(keyPath); |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 checkInjection(scriptState(), IDBKey::createDate(4567), scriptObject, "foo.b
az"); | 170 checkInjection(scriptState(), IDBKey::createDate(4567), scriptObject, "foo.b
az"); |
170 checkInjection(scriptState(), IDBKey::createDate(4567), scriptObject, "bar")
; | 171 checkInjection(scriptState(), IDBKey::createDate(4567), scriptObject, "bar")
; |
171 checkInjection(scriptState(), IDBKey::createArray(IDBKey::KeyArray()), scrip
tObject, "foo.baz"); | 172 checkInjection(scriptState(), IDBKey::createArray(IDBKey::KeyArray()), scrip
tObject, "foo.baz"); |
172 checkInjection(scriptState(), IDBKey::createArray(IDBKey::KeyArray()), scrip
tObject, "bar"); | 173 checkInjection(scriptState(), IDBKey::createArray(IDBKey::KeyArray()), scrip
tObject, "bar"); |
173 | 174 |
174 checkInjectionFails(scriptState(), IDBKey::createString("zoo"), scriptObject
, "foo.bar.baz"); | 175 checkInjectionFails(scriptState(), IDBKey::createString("zoo"), scriptObject
, "foo.bar.baz"); |
175 checkInjection(scriptState(), IDBKey::createString("zoo"), scriptObject, "fo
o.xyz.foo"); | 176 checkInjection(scriptState(), IDBKey::createString("zoo"), scriptObject, "fo
o.xyz.foo"); |
176 } | 177 } |
177 | 178 |
178 } // namespace | 179 } // namespace |
OLD | NEW |