Add toWebCoreString() / toWebCoreAtomicString() overloads taking a v8::String

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 145 matching lines @@
     template <class CallbackInfo>
     inline void v8SetReturnValueStringOrUndefined(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
     {
         if (string.isNull()) {
             v8SetReturnValueUndefined(info);
             return;
         }
         V8PerIsolateData::from(isolate)->stringCache()->setReturnValueFromString(info.GetReturnValue(), string.impl());
     }
 
+    // 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 toWebCoreString(v8::Handle<v8::String> value)
+    {
+        return v8StringToWebCoreString<String>(value, Externalize);
+    }
+
+    inline String toWebCoreStringWithNullCheck(v8::Handle<v8::String> value)
+    {
+        if (value.IsEmpty() || value->IsNull())
+            return String();
+        return toWebCoreString(value);
+    }
+
+    inline String toWebCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::String> value)
+    {
+        if (value.IsEmpty() || value->IsNull() || value->IsUndefined())
+            return String();
+        return toWebCoreString(value);
+    }
+
+    inline AtomicString toWebCoreAtomicString(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().
     inline String toWebCoreString(v8::Handle<v8::Value> value)
     {
         V8StringResource<> stringResource(value);
@@ skipping 22 matching lines @@
 
     // FIXME: See the above comment.
     inline AtomicString toWebCoreAtomicString(v8::Handle<v8::Value> value)
     {
         V8StringResource<> stringResource(value);
         if (!stringResource.prepare())
             return AtomicString();
         return stringResource;
     }
 
-    // FIXME: See the above comment.
-    inline AtomicString toWebCoreAtomicStringWithNullCheck(v8::Handle<v8::Value> value)
-    {
-        V8StringResource<WithNullCheck> stringResource(value);
-        if (!stringResource.prepare())
-            return AtomicString();
-        return stringResource;
-    }
-
     // 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(const String& string, v8::Isolate* isolate)
     {
         if (string.isNull())
             return v8::String::Empty(isolate);
         return V8PerIsolateData::from(isolate)->stringCache()->v8ExternalString(string.impl(), isolate);
     }
@@ skipping 408 matching lines @@
     }
 
     v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, ScriptWrappable*, v8::Handle<v8::String> key);
 
     v8::Isolate* isolateForScriptExecutionContext(ScriptExecutionContext*);
     v8::Isolate* isolateForFrame(Frame*);
 
 } // namespace WebCore
 
 #endif // V8Binding_h