Cleanup dart to string conversions.

Source/WebCore/bindings/dart/DartUtilities.cpp

 // Copyright 2011, 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:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 #include "V8Proxy.h"
 #include "WebKitFlags.h"
 
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
 
 const char* DartUtilities::htmlLibraryName = "dart:html";
 
-PassRefPtr<StringImpl> DartUtilities::toStringImpl(Dart_Handle object, ConversionFlag flag, Dart_Handle& exception)
+PassRefPtr<StringImpl> DartUtilities::toStringImpl(Dart_Handle object, Dart_Handle& exception)
 {
-    if (flag == ConvertNullToDefaultValue && Dart_IsNull(object))
-        return 0;
-
     if (!Dart_IsString(object)) {
         exception = Dart_NewString("String expected");
         return 0;
     }
     if (!Dart_IsString16(object)) {
         // FIXME: consider convertion to UTF16 in this case.
         exception = Dart_NewString("32-bit string met, cannot be used in DOM API");
         return 0;
     }
 
@@ skipping 56 matching lines @@
         return Dart_IntegerToInt64(object, value);
         // FIXME: support bigints.
     }
 };
 
 int64_t DartUtilities::toInteger(Dart_Handle object, Dart_Handle& exception)
 {
     return convert<IntegerTrait>(object, exception);
 }
 
+String DartUtilities::toString(Dart_Handle object)
+{
+    Dart_Handle exception = 0;
+    String string = dartToString(object, exception);
+    ASSERT(!exception);
+    return string;
+}
+
 struct DoubleTrait {
     typedef double nativeType;
     static Dart_Handle convert(Dart_Handle object, double* value)
     {
         if (!Dart_IsNumber(object))
             return Dart_Error("the object !is Number");
 
         if (!Dart_IsDouble(object)) {
             object = Dart_Invoke(object, Dart_NewString("toDouble"), 0, 0);
             if (Dart_IsError(object))
@@ skipping 221 matching lines @@
 
 PassRefPtr<WebKitFlags> DartUtilities::toWebKitFlags(Dart_Handle object, Dart_Handle& exception)
 {
     Vector<Dart_Handle> keys;
     Vector<Dart_Handle> values;
     DartUtilities::extractMapElements(object, exception, keys, values);
     if (exception)
         return 0;
     RefPtr<WebKitFlags> flags = WebKitFlags::create();
     for (size_t i = 0; i < keys.size(); ++i) {
-        String key = DartUtilities::toStringImpl(keys[i], ConvertNone, exception);
+        String key = DartUtilities::dartToString(keys[i], exception);
         if (exception)
             return 0;
 
         bool value = DartUtilities::dartToBool(values[i], exception);
         if (exception)
             return 0;
 
         if (key == "create")
             flags->setCreate(value);
         else if (key == "exclusive")
@@ skipping 156 matching lines @@
         errorMessage = internalErrorPrefix + Dart_GetError(result);
     else {
         // Print the exception.
         Dart_Handle exception = Dart_ErrorGetException(result);
         ASSERT(!Dart_IsError(exception));
 
         exception = Dart_ToString(exception);
         if (Dart_IsError(exception))
             errorMessage = String("Error converting exception to a string: ") + Dart_GetError(exception);
         else
-            errorMessage = String("Exception: ") + DartUtilities::dartStringToString(exception);
+            errorMessage = String("Exception: ") + DartUtilities::toString(exception);
 
         // FIXME: Fill in the callStack, sourceFile, and lineNumber
         // and remove the below once the Dart APIs to iterate over the
         // trace are available.
 
         // Print the stack trace.
         Dart_Handle stacktrace = Dart_ErrorGetStacktrace(result);
         ASSERT(!Dart_IsError(stacktrace));
 
         stacktrace = Dart_ToString(stacktrace);
         if (Dart_IsError(stacktrace))
             errorMessage += String("\nError converting stack trace to a string: ") + Dart_GetError(stacktrace);
         else
-            errorMessage += String("\nStack Trace: ") + DartUtilities::dartStringToString(stacktrace);
+            errorMessage += String("\nStack Trace: ") + DartUtilities::toString(stacktrace);
     }
 
     if (context && context->isDocument())
         static_cast<Document*>(context)->reportException(errorMessage, lineNumber, sourceURL, callStack);
 }
 
 Dart_Handle DartUtilities::notImplementedException(const char* fileName, int lineNumber)
 {
     Dart_Handle args[2] = { Dart_NewString(fileName), Dart_NewInteger(lineNumber) };
     Dart_Handle result = DartUtilities::invokeUtilsMethod("makeNotImplementedException", 2, args);
     ASSERT(!Dart_IsError(result));
     return result;
 }
 
 Dart_Handle DartUtilities::invokeUtilsMethod(const char* methodName, int argCount, Dart_Handle* args)
 {
     Dart_Handle library = htmlLibraryForCurrentIsolate();
     ASSERT(!Dart_IsError(library));
 
     Dart_Handle utilsClass = Dart_GetClass(library, Dart_NewString("_Utils"));
     ASSERT(!Dart_IsError(utilsClass));
 
     return Dart_Invoke(utilsClass, Dart_NewString(methodName), argCount, args);
 }
 
 }