| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 value = stringValue; | 174 value = stringValue; |
| 175 return true; | 175 return true; |
| 176 } | 176 } |
| 177 | 177 |
| 178 bool Dictionary::get(const String& key, ScriptValue& value) const | 178 bool Dictionary::get(const String& key, ScriptValue& value) const |
| 179 { | 179 { |
| 180 v8::Local<v8::Value> v8Value; | 180 v8::Local<v8::Value> v8Value; |
| 181 if (!getKey(key, v8Value)) | 181 if (!getKey(key, v8Value)) |
| 182 return false; | 182 return false; |
| 183 | 183 |
| 184 value = ScriptValue(v8Value); | 184 value = ScriptValue(v8Value, m_isolate); |
| 185 return true; | 185 return true; |
| 186 } | 186 } |
| 187 | 187 |
| 188 bool Dictionary::get(const String& key, unsigned short& value) const | 188 bool Dictionary::get(const String& key, unsigned short& value) const |
| 189 { | 189 { |
| 190 v8::Local<v8::Value> v8Value; | 190 v8::Local<v8::Value> v8Value; |
| 191 if (!getKey(key, v8Value)) | 191 if (!getKey(key, v8Value)) |
| 192 return false; | 192 return false; |
| 193 | 193 |
| 194 v8::Local<v8::Int32> v8Int32 = v8Value->ToInt32(); | 194 v8::Local<v8::Int32> v8Int32 = v8Value->ToInt32(); |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 if (!options->Has(key)) | 611 if (!options->Has(key)) |
| 612 continue; | 612 continue; |
| 613 V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, ke
y, false); | 613 V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, ke
y, false); |
| 614 names.append(stringKey); | 614 names.append(stringKey); |
| 615 } | 615 } |
| 616 | 616 |
| 617 return true; | 617 return true; |
| 618 } | 618 } |
| 619 | 619 |
| 620 } // namespace WebCore | 620 } // namespace WebCore |
| OLD | NEW |