| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 value = stringValue; | 173 value = stringValue; |
| 174 return true; | 174 return true; |
| 175 } | 175 } |
| 176 | 176 |
| 177 bool Dictionary::get(const String& key, ScriptValue& value) const | 177 bool Dictionary::get(const String& key, ScriptValue& value) const |
| 178 { | 178 { |
| 179 v8::Local<v8::Value> v8Value; | 179 v8::Local<v8::Value> v8Value; |
| 180 if (!getKey(key, v8Value)) | 180 if (!getKey(key, v8Value)) |
| 181 return false; | 181 return false; |
| 182 | 182 |
| 183 value = ScriptValue(v8Value); | 183 value = ScriptValue(v8Value, m_isolate); |
| 184 return true; | 184 return true; |
| 185 } | 185 } |
| 186 | 186 |
| 187 bool Dictionary::get(const String& key, unsigned short& value) const | 187 bool Dictionary::get(const String& key, unsigned short& value) const |
| 188 { | 188 { |
| 189 v8::Local<v8::Value> v8Value; | 189 v8::Local<v8::Value> v8Value; |
| 190 if (!getKey(key, v8Value)) | 190 if (!getKey(key, v8Value)) |
| 191 return false; | 191 return false; |
| 192 | 192 |
| 193 v8::Local<v8::Int32> v8Int32 = v8Value->ToInt32(); | 193 v8::Local<v8::Int32> v8Int32 = v8Value->ToInt32(); |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 if (!options->Has(key)) | 593 if (!options->Has(key)) |
| 594 continue; | 594 continue; |
| 595 V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, ke
y, false); | 595 V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, ke
y, false); |
| 596 names.append(stringKey); | 596 names.append(stringKey); |
| 597 } | 597 } |
| 598 | 598 |
| 599 return true; | 599 return true; |
| 600 } | 600 } |
| 601 | 601 |
| 602 } // namespace WebCore | 602 } // namespace WebCore |
| OLD | NEW |