Use V8TRYCATCH_FOR_V8STRINGRESOURCE() macro instead of toCoreStringWithUndefinedOrNullCheck()

Source/bindings/v8/V8Binding.h

 /*
 * Copyright (C) 2009 Google Inc. All rights reserved.
 * Copyright (C) 2012 Ericsson AB. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
@@ skipping 143 matching lines @@
     }
 
     // Convert v8::String to a WTF::String. If the V8 string is not already
     // an external string then it is transformed into an external string at this
     // point to avoid repeated conversions.
     inline String toCoreString(v8::Handle<v8::String> value)
     {
         return v8StringToWebCoreString<String>(value, Externalize);
     }
 
+    inline String toCoreString(v8::Handle<v8::Value> value)
+    {
+        if (!value->IsString())
+            return String();
+        return toCoreString(value.As<v8::String>());
+    }
+
     inline String toCoreStringWithNullCheck(v8::Handle<v8::String> value)
     {
         if (value.IsEmpty() || value->IsNull())
             return String();
         return toCoreString(value);
     }
 
     inline String toCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::String> value)
     {
         if (value.IsEmpty() || value->IsNull() || value->IsUndefined())
             return String();
         return toCoreString(value);
     }
 
     inline AtomicString toCoreAtomicString(v8::Handle<v8::String> value)
     {
         return v8StringToWebCoreString<AtomicString>(value, Externalize);
     }
 
-    // Convert v8 types to a WTF::String. If the V8 string is not already
-    // an external string then it is transformed into an external string at this
-    // point to avoid repeated conversions.
-    //
-    // FIXME: Replace all the call sites with V8TRYCATCH_FOR_V8STRINGRESOURCE().
-    // Using this method will lead to a wrong behavior, because you cannot stop the
-    // execution when an exception is thrown inside stringResource.prepare().
+    // This method will return a null String if the v8::Value does not contain a v8::String.
+    // It will not call ToString() on the v8::Value. If you want ToString() to be called,
+    // please use the V8TRYCATCH_FOR_V8STRINGRESOURCE_*() macros instead.

[haraken, 2013/12/12 15:41:43]

You want to add this comment to toCoreString(v8::Handle<v8::Value> value) as
well. Probably we want to put these two methods next to each other.

[Inactive, 2013/12/12 15:44:22]

Oh my bad, I did not intend to include toCoreString(v8::Handle<v8::Value> value)
in this patch. It is not currently used. I forgot to remove it before uploading.

     inline String toCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::Value> value)
     {
-        V8StringResource<WithUndefinedOrNullCheck> stringResource(value);
-        if (!stringResource.prepare())
+        if (value.IsEmpty() || value->IsNull() || value->IsUndefined() || !value->IsString())
             return String();
-        return stringResource;
+
+        return toCoreString(value.As<v8::String>());
     }
 
     // Convert a string to a V8 string.
     // Return a V8 external string that shares the underlying buffer with the given
     // WebCore string. The reference counting mechanism is used to keep the
     // underlying buffer alive while the string is still live in the V8 engine.
     inline v8::Handle<v8::String> v8String(v8::Isolate* isolate, const String& string)
     {
         if (string.isNull())
             return v8::String::Empty(isolate);
@@ skipping 490 matching lines @@
 
     // Converts a DOM object to a v8 value.
     // This is a no-inline version of toV8(). If you want to call toV8()
     // without creating #include cycles, you can use this function instead.
     // Each specialized implementation will be generated.
     template<typename T>
     v8::Handle<v8::Value> toV8NoInline(T* impl, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 } // namespace WebCore
 
 #endif // V8Binding_h