Cleanup dart to string conversions.

Source/WebCore/bindings/dart/DartNativeUtilities.cpp

 // Copyright 2012, 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 58 matching lines @@
     Dart_ThrowException(exception);
     ASSERT_NOT_REACHED();
 }
 
 static void print(Dart_NativeArguments args)
 {
     DartApiScope dartApiScope;
     Dart_Handle exception = 0;
 
     {
-        const ParameterAdapter<String> message(Dart_GetNativeArgument(args, 0));
-        if (!message.conversionSuccessful()) {
-            exception = message.exception();
+        DartStringAdapter message = DartUtilities::dartToString(Dart_GetNativeArgument(args, 0), exception);
+        if (exception)
             goto fail;
-        }
 
         printf("[print]: %s\n", String(message).utf8().data());

[Anton Muhin, 2012/06/26 16:52:28]

do you still need this conversion?

[podivilov, 2012/06/26 18:07:38]

Sure, DartStringAdapter has no utf8 method.

         return;
     }
 
 fail:
     Dart_ThrowException(exception);
     ASSERT_NOT_REACHED();
 }
 
 static void npObjectRetrieve(Dart_NativeArguments args)
 {
     DartApiScope dartApiScope;
     Dart_Handle exception = 0;
     {
-        const ParameterAdapter<String> key(Dart_GetNativeArgument(args, 0));
-        if (!key.conversionSuccessful()) {
-            exception = key.exception();
+        DartStringAdapter key = DartUtilities::dartToString(Dart_GetNativeArgument(args, 0), exception);
+        if (exception)
             goto fail;
-        }
 
         DartController* controller = DartController::retrieve(DartUtilities::scriptExecutionContext());
         NPObject* npObject = controller->npObject(key);
         if (npObject) {
             // FIXME: put NPObjects into a map as well.
             Dart_SetReturnValue(args, DartDOMWrapper::newWrapper("_NPObject", npObject));
         }
         return;
     }
 
@@ skipping 68 matching lines @@
     Dart_Handle exception = 0;
     {
         // IMPORTANT NOTE: Runtime type of first argument must be checked
         // by Dart code---we're doing read without any additional checks here!
         intptr_t value;
         Dart_Handle result = Dart_GetNativeInstanceField(Dart_GetNativeArgument(args, 0), 0, &value);
         ASSERT(!Dart_IsError(result));
         UNUSED_PARAM(result);
         RefPtr<DOMWindow> targetWindow(reinterpret_cast<DOMWindow*>(value));
 
-        const ParameterAdapter<String> entryPoint(Dart_GetNativeArgument(args, 1));
-        if (!entryPoint.conversionSuccessful()) {
-            exception = entryPoint.exception();
+        DartStringAdapter entryPoint = DartUtilities::dartToString(Dart_GetNativeArgument(args, 1), exception);
+        if (exception)
             goto fail;
-        }
 
         ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();
         if (!context) {
             exception = DartUtilities::internalErrorException("[spawnDomIsolate] failed to retrieve ScriptExecutionContext");
             goto fail;
         }
 
         DartController* controller = DartController::retrieve(context);
         if (!controller) {
             exception = DartUtilities::internalErrorException("[spawnDomIsolate] failed to retrieve DartController");
@@ skipping 26 matching lines @@
 extern Dart_NativeFunction snapshotResolver(Dart_Handle name, int argumentCount);
 
 Dart_NativeFunction domResolver(Dart_Handle name, int argumentCount)
 {
     // Some utility functions.
     if (Dart_NativeFunction func = snapshotResolver(name, argumentCount))
         return func;
     if (Dart_NativeFunction func = DartDOMStringMap::resolver(name, argumentCount))
         return func;
 
-    String str = DartUtilities::dartStringToString(name);
+    String str = DartUtilities::toString(name);
     if (argumentCount == 0 && str == "Utils_window")
         return topLevelWindow;
     if (argumentCount == 1 && str == "Utils_print")
         return print;
     if (argumentCount == 2 && str == "Utils_spawnDomIsolate")
         return spawnDomIsolate;
     if (argumentCount == 1 && str == "NPObject_retrieve")
         return npObjectRetrieve;
     if (argumentCount == 2 && str == "NPObject_property")
         return npObjectProperty;
     if (argumentCount == 3 && str == "NPObject_invoke")
         return npObjectInvoke;
     if (argumentCount == 1 && str == "DOMWindow_history_cross_frame_Getter")
         return DartDOMWindowInternal::historyCrossFrameGetter;
     if (argumentCount == 1 && str == "DOMWindow_location_cross_frame_Getter")
         return DartDOMWindowInternal::locationCrossFrameGetter;
     return 0;
 }
 
 }