Rename V8TRYCATCH_* macros in v8/V8BindingMacros.h

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 190 matching lines @@
     return true;
 }
 
 template<typename StringType>
 inline bool Dictionary::getStringType(const String& key, StringType& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return false;
 
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, v8Value, false);
+    V8STRINGRESOURCE_PREPARE_RETURN(V8StringResource<>, stringValue, v8Value, false);
     value = stringValue;
     return true;
 }
 
 bool Dictionary::get(const String& key, String& value) const
 {
     return getStringType(key, value);
 }
 
 bool Dictionary::get(const String& key, AtomicString& value) const
 {
     return getStringType(key, value);
 }
 
 bool Dictionary::convert(ConversionContext& context, const String& key, String& value) const
 {
     ConversionContextScope scope(context);
 
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return true;
 
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, v8Value, false);
+    V8STRINGRESOURCE_PREPARE_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;
 
@@ skipping 131 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(m_isolate, i));
-        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, indexedValue, false);
+        V8STRINGRESOURCE_PREPARE_RETURN(V8StringResource<>, stringValue, indexedValue, false);
         value.add(stringValue);
     }
 
     return true;
 }
 
 bool Dictionary::convert(ConversionContext& context, const String& key, HashSet<AtomicString>& value) const
 {
     ConversionContextScope scope(context);
 
@@ skipping 11 matching lines @@
 
     return get(key, value);
 }
 
 bool Dictionary::getWithUndefinedOrNullCheck(const String& key, String& value) const
 {
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value) || WebCore::isUndefinedOrNull(v8Value))
         return false;
 
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, v8Value, false);
+    V8STRINGRESOURCE_PREPARE_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;
 
@@ skipping 164 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(m_isolate, i));
-        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, indexedValue, false);
+        V8STRINGRESOURCE_PREPARE_RETURN(V8StringResource<>, stringValue, indexedValue, false);
         value.append(stringValue);
     }
 
     return true;
 }
 
 bool Dictionary::convert(ConversionContext& context, const String& key, Vector<String>& value) const
 {
     ConversionContextScope scope(context);
 
@@ skipping 80 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);
-        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, key, false);
-        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, value, false);
+        V8STRINGRESOURCE_PREPARE_RETURN(V8StringResource<>, stringKey, key, false);
+        V8STRINGRESOURCE_PREPARE_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;
-        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringKey, key, false);
+        V8STRINGRESOURCE_PREPARE_RETURN(V8StringResource<>, stringKey, key, false);
         names.append(stringKey);
     }
 
     return true;
 }
 
 void Dictionary::ConversionContext::resetPerPropertyContext()
 {
     if (m_dirty) {
         m_dirty = false;
@@ skipping 11 matching lines @@
 
     return *this;
 }
 
 void Dictionary::ConversionContext::throwTypeError(const String& detail)
 {
     exceptionState().throwTypeError(detail);
 }
 
 } // namespace WebCore