Have Dictionary use V8TRYCATCH_FOR_V8STRINGRESOURCE() macro

Source/bindings/v8/Dictionary.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 152 matching lines @@
     bool unused;
     return get(key, value, unused);
 }
 
 bool Dictionary::get(const String& key, String& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return false;
 
-    // FIXME: It is possible for this to throw in which case we'd be getting back
-    //        an empty string and returning true when we should be returning false.
-    //        See fast/dom/Geolocation/script-tests/argument-types.js for a similar
-    //        example.
-    value = toWebCoreString(v8Value);
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, v8Value, false);
+    value = stringValue;
     return true;
 }
 
 bool Dictionary::get(const String& key, ScriptValue& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return false;
 
     value = ScriptValue(v8Value);
@@ skipping 115 matching lines @@
 
     // FIXME: Support array-like objects
     if (!v8Value->IsArray())
         return false;
 
     ASSERT(m_isolate);
     ASSERT(m_isolate == v8::Isolate::GetCurrent());
     v8::Local<v8::Array> v8Array = v8::Local<v8::Array>::Cast(v8Value);
     for (size_t i = 0; i < v8Array->Length(); ++i) {
         v8::Local<v8::Value> indexedValue = v8Array->Get(v8::Integer::New(i, m_isolate));
-        value.add(toWebCoreString(indexedValue));
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, indexedValue, false);
+        value.add(stringValue);
     }
 
     return true;
 }
 
 bool Dictionary::getWithUndefinedOrNullCheck(const String& key, String& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value) || v8Value->IsNull() || v8Value->IsUndefined())
         return false;
 
-    // FIXME: It is possible for this to throw in which case we'd be getting back
-    //        an empty string and returning true when we should be returning false.
-    //        See fast/dom/Geolocation/script-tests/argument-types.js for a similar
-    //        example.
-    value = WebCore::isUndefinedOrNull(v8Value) ? String() : toWebCoreString(v8Value);
+    if (WebCore::isUndefinedOrNull(v8Value)) {
+        value = String();
+        return true;
+    }
+
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, v8Value, false);
+    value = stringValue;
     return true;
 }
 
 bool Dictionary::get(const String& key, RefPtr<Uint8Array>& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return false;
 
     value = 0;
@@ skipping 151 matching lines @@
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return false;
 
     if (!v8Value->IsArray())
         return false;
 
     v8::Local<v8::Array> v8Array = v8::Local<v8::Array>::Cast(v8Value);
     for (size_t i = 0; i < v8Array->Length(); ++i) {
         v8::Local<v8::Value> indexedValue = v8Array->Get(v8::Uint32::New(i));
-        value.append(toWebCoreString(indexedValue));
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, indexedValue, false);
+        value.append(stringValue);
     }
 
     return true;
 }
 
 bool Dictionary::get(const String& key, ArrayValue& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return false;
@@ skipping 65 matching lines @@
 
     v8::Local<v8::Array> properties = options->GetOwnPropertyNames();
     if (properties.IsEmpty())
         return true;
     for (uint32_t i = 0; i < properties->Length(); ++i) {
         v8::Local<v8::String> key = properties->Get(i)->ToString();
         if (!options->Has(key))
             continue;
 
         v8::Local<v8::Value> value = options->Get(key);
-        String stringKey = toWebCoreString(key);
-        String stringValue = toWebCoreString(value);
-        if (!stringKey.isEmpty())
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, key, false);
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, value, false);
+        if (!static_cast<const String&>(stringKey).isEmpty())
             hashMap.set(stringKey, stringValue);
     }
 
     return true;
 }
 
 bool Dictionary::getOwnPropertyNames(Vector<String>& names) const
 {
     if (!isObject())
         return false;
 
     v8::Handle<v8::Object> options = m_options->ToObject();
     if (options.IsEmpty())
         return false;
 
     v8::Local<v8::Array> properties = options->GetOwnPropertyNames();
     if (properties.IsEmpty())
         return true;
     for (uint32_t i = 0; i < properties->Length(); ++i) {
         v8::Local<v8::String> key = properties->Get(i)->ToString();
         if (!options->Has(key))
             continue;
-        names.append(toWebCoreString(key));
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, key, false);
+        names.append(stringKey);
     }
 
     return true;
 }
 
 } // namespace WebCore