runtime/vm/dart_api_impl.cc - Issue 2481873005: clang-format runtime/vm

Unified Diff: runtime/vm/dart_api_impl.cc

Issue 2481873005: clang-format runtime/vm (Closed)

Patch Set: Merge Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: runtime/vm/dart_api_impl.cc

diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc

index e1c2acacbdeb27286fb118e1a10d79ad1abb2ffd..72b14b9ca7c20249dacf2b8e6c13a47abfe9be8d 100644

--- a/runtime/vm/dart_api_impl.cc

+++ b/runtime/vm/dart_api_impl.cc

@@ -60,12 +60,18 @@ namespace dart {

DECLARE_FLAG(bool, print_class_table);

DECLARE_FLAG(bool, verify_handles);

#if defined(DART_NO_SNAPSHOT)

-DEFINE_FLAG(bool, check_function_fingerprints, true,

+DEFINE_FLAG(bool,

+ check_function_fingerprints,

+ true,

"Check function fingerprints");

#endif // defined(DART_NO_SNAPSHOT).

-DEFINE_FLAG(bool, verify_acquired_data, false,

+DEFINE_FLAG(bool,

+ verify_acquired_data,

+ false,

"Verify correct API acquire/release of typed data.");

-DEFINE_FLAG(bool, support_externalizable_strings, false,

+DEFINE_FLAG(bool,

+ support_externalizable_strings,

+ false,

"Support Dart_MakeExternalString.");

@@ -86,17 +92,19 @@ const char* CanonicalFunction(const char* func) {

#ifndef PRODUCT

#define API_TIMELINE_DURATION \

- TimelineDurationScope tds(Thread::Current(), \

- Timeline::GetAPIStream(), \

+ TimelineDurationScope tds(Thread::Current(), Timeline::GetAPIStream(), \

CURRENT_FUNC)

#define API_TIMELINE_BEGIN_END \

- TimelineBeginEndScope tbes(Thread::Current(), \

- Timeline::GetAPIStream(), \

+ TimelineBeginEndScope tbes(Thread::Current(), Timeline::GetAPIStream(), \

CURRENT_FUNC)

#else

-#define API_TIMELINE_DURATION do { } while (false)

-#define API_TIMELINE_BEGIN_END do { } while (false)

+#define API_TIMELINE_DURATION \

+ do { \

+ } while (false)

+#define API_TIMELINE_BEGIN_END \

+ do { \

+ } while (false)

#endif // !PRODUCT

#if defined(DEBUG)

@@ -105,10 +113,10 @@ const char* CanonicalFunction(const char* func) {

// or not. An assertion is raised if a type is not canonicalized.

class FunctionVisitor : public ObjectVisitor {

public:

- explicit FunctionVisitor(Thread* thread) :

- classHandle_(Class::Handle(thread->zone())),

- funcHandle_(Function::Handle(thread->zone())),

- typeHandle_(AbstractType::Handle(thread->zone())) {}

+ explicit FunctionVisitor(Thread* thread)

+ : classHandle_(Class::Handle(thread->zone())),

+ funcHandle_(Function::Handle(thread->zone())),

+ typeHandle_(AbstractType::Handle(thread->zone())) {}

void VisitObject(RawObject* obj) {

if (obj->IsFunction()) {

@@ -122,19 +130,15 @@ class FunctionVisitor : public ObjectVisitor {

// Verify that the result type of a function is canonical or a

// TypeParameter.

typeHandle_ ^= funcHandle_.result_type();

- ASSERT(typeHandle_.IsMalformed() ||

- !typeHandle_.IsResolved() ||

- typeHandle_.IsTypeParameter() ||

- typeHandle_.IsCanonical());

+ ASSERT(typeHandle_.IsMalformed() || !typeHandle_.IsResolved() ||

+ typeHandle_.IsTypeParameter() || typeHandle_.IsCanonical());

// Verify that the types in the function signature are all canonical or

// a TypeParameter.

const intptr_t num_parameters = funcHandle_.NumParameters();

for (intptr_t i = 0; i < num_parameters; i++) {

typeHandle_ = funcHandle_.ParameterTypeAt(i);

- ASSERT(typeHandle_.IsMalformed() ||

- !typeHandle_.IsResolved() ||

- typeHandle_.IsTypeParameter() ||

- typeHandle_.IsCanonical());

+ ASSERT(typeHandle_.IsMalformed() || !typeHandle_.IsResolved() ||

+ typeHandle_.IsTypeParameter() || typeHandle_.IsCanonical());

}

@@ -156,12 +160,9 @@ static RawInstance* GetListInstance(Zone* zone, const Object& obj) {

const Instance& instance = Instance::Cast(obj);

const Class& obj_class = Class::Handle(zone, obj.clazz());

Error& malformed_type_error = Error::Handle(zone);

- if (obj_class.IsSubtypeOf(Object::null_type_arguments(),

- list_class,

+ if (obj_class.IsSubtypeOf(Object::null_type_arguments(), list_class,

Object::null_type_arguments(),

- &malformed_type_error,

- NULL,

- Heap::kNew)) {

+ &malformed_type_error, NULL, Heap::kNew)) {

ASSERT(malformed_type_error.IsNull()); // Type is a raw List.

return instance.raw();

}

@@ -178,12 +179,9 @@ static RawInstance* GetMapInstance(Zone* zone, const Object& obj) {

const Instance& instance = Instance::Cast(obj);

const Class& obj_class = Class::Handle(zone, obj.clazz());

Error& malformed_type_error = Error::Handle(zone);

- if (obj_class.IsSubtypeOf(Object::null_type_arguments(),

- map_class,

+ if (obj_class.IsSubtypeOf(Object::null_type_arguments(), map_class,

Object::null_type_arguments(),

- &malformed_type_error,

- NULL,

- Heap::kNew)) {

+ &malformed_type_error, NULL, Heap::kNew)) {

ASSERT(malformed_type_error.IsNull()); // Type is a raw Map.

return instance.raw();

}

@@ -312,9 +310,7 @@ static Dart_Handle GetNativeFieldsOfArgument(NativeArguments* arguments,

intptr_t* field_values,

const char* current_func) {

ASSERT(field_values != NULL);

- if (Api::GetNativeFieldsOfArgument(arguments,

- arg_index,

- num_fields,

+ if (Api::GetNativeFieldsOfArgument(arguments, arg_index, num_fields,

field_values)) {

return Api::Success();

}

@@ -330,15 +326,16 @@ static Dart_Handle GetNativeFieldsOfArgument(NativeArguments* arguments,

// We did not succeed in extracting the native fields report the

// appropriate error.

if (!obj.IsInstance()) {

- return Api::NewError("%s expects argument at index '%d' to be of"

- " type Instance.", current_func, arg_index);

+ return Api::NewError(

+ "%s expects argument at index '%d' to be of"

+ " type Instance.",

+ current_func, arg_index);

}

const Instance& instance = Instance::Cast(obj);

int field_count = instance.NumNativeFields();

ASSERT(num_fields != field_count);

- return Api::NewError(

- "%s: expected %d 'num_fields' but was passed in %d.",

- current_func, field_count, num_fields);

+ return Api::NewError("%s: expected %d 'num_fields' but was passed in %d.",

+ current_func, field_count, num_fields);

}

@@ -354,13 +351,12 @@ Heap::Space SpaceForExternal(Thread* thread, intptr_t size) {

}

-static RawObject* Send0Arg(const Instance& receiver,

- const String& selector) {

+static RawObject* Send0Arg(const Instance& receiver, const String& selector) {

const intptr_t kNumArgs = 1;

ArgumentsDescriptor args_desc(

Array::Handle(ArgumentsDescriptor::New(kNumArgs)));

- const Function& function = Function::Handle(

- Resolver::ResolveDynamic(receiver, selector, args_desc));

+ const Function& function =

+ Function::Handle(Resolver::ResolveDynamic(receiver, selector, args_desc));

if (function.IsNull()) {

return ApiError::New(String::Handle(String::New("")));

}

@@ -376,8 +372,8 @@ static RawObject* Send1Arg(const Instance& receiver,

const intptr_t kNumArgs = 2;

ArgumentsDescriptor args_desc(

Array::Handle(ArgumentsDescriptor::New(kNumArgs)));

- const Function& function = Function::Handle(

- Resolver::ResolveDynamic(receiver, selector, args_desc));

+ const Function& function =

+ Function::Handle(Resolver::ResolveDynamic(receiver, selector, args_desc));

if (function.IsNull()) {

return ApiError::New(String::Handle(String::New("")));

}

@@ -436,25 +432,22 @@ RawObject* Api::UnwrapHandle(Dart_Handle object) {

Thread* thread = Thread::Current();

ASSERT(thread->IsMutatorThread());

ASSERT(thread->isolate() != NULL);

- ASSERT(!FLAG_verify_handles ||

- thread->IsValidLocalHandle(object) ||

+ ASSERT(!FLAG_verify_handles || thread->IsValidLocalHandle(object) ||

Dart::IsReadOnlyApiHandle(object));

ASSERT(FinalizablePersistentHandle::raw_offset() == 0 &&

- PersistentHandle::raw_offset() == 0 &&

- LocalHandle::raw_offset() == 0);

+ PersistentHandle::raw_offset() == 0 && LocalHandle::raw_offset() == 0);

#endif

return (reinterpret_cast<LocalHandle*>(object))->raw();

}

#define DEFINE_UNWRAP(type) \

- const type& Api::Unwrap##type##Handle(Zone* zone, \

- Dart_Handle dart_handle) { \

+ const type& Api::Unwrap##type##Handle(Zone* zone, Dart_Handle dart_handle) { \

const Object& obj = Object::Handle(zone, Api::UnwrapHandle(dart_handle)); \

if (obj.Is##type()) { \

return type::Cast(obj); \

} \

- return type::Handle(zone ); \

+ return type::Handle(zone); \

}

CLASS_LIST_FOR_HANDLES(DEFINE_UNWRAP)

#undef DEFINE_UNWRAP

@@ -472,7 +465,8 @@ const String& Api::UnwrapStringHandle(const ReusableObjectHandleScope& reuse,

const Instance& Api::UnwrapInstanceHandle(

- const ReusableObjectHandleScope& reuse, Dart_Handle dart_handle) {

+ const ReusableObjectHandleScope& reuse,

+ Dart_Handle dart_handle) {

Object& ref = reuse.Handle();

ref = Api::UnwrapHandle(dart_handle);

if (ref.IsInstance()) {

@@ -646,15 +640,15 @@ bool Api::GetNativeBooleanArgument(NativeArguments* arguments,

NoSafepointScope no_safepoint_scope;

RawObject* raw_obj = arguments->NativeArgAt(arg_index);

if (raw_obj->IsHeapObject()) {

- intptr_t cid = raw_obj->GetClassId();

- if (cid == kBoolCid) {

- *value = (raw_obj == Object::bool_true().raw());

- return true;

- }

- if (cid == kNullCid) {

- *value = false;

- return true;

- }

+ intptr_t cid = raw_obj->GetClassId();

+ if (cid == kBoolCid) {

+ *value = (raw_obj == Object::bool_true().raw());

+ return true;

+ }

+ if (cid == kNullCid) {

+ *value = false;

+ return true;

+ }

}

return false;

}

@@ -717,8 +711,7 @@ bool Api::GetNativeFieldsOfArgument(NativeArguments* arguments,

} else if (num_fields == Smi::Value(native_fields->ptr()->length_)) {

intptr_t* native_values =

bit_cast<intptr_t*, uint8_t*>(native_fields->ptr()->data());

- memmove(field_values,

- native_values,

+ memmove(field_values, native_values,

(num_fields * sizeof(field_values[0])));

}

return true;

@@ -751,7 +744,8 @@ FinalizablePersistentHandle* FinalizablePersistentHandle::Cast(

void FinalizablePersistentHandle::Finalize(

- Isolate* isolate, FinalizablePersistentHandle* handle) {

+ Isolate* isolate,

+ FinalizablePersistentHandle* handle) {

if (!handle->raw()->IsHeapObject()) {

return; // Free handle.

}

@@ -884,8 +878,7 @@ DART_EXPORT Dart_Handle Dart_NewUnhandledExceptionError(Dart_Handle exception) {

DART_EXPORT Dart_Handle Dart_PropagateError(Dart_Handle handle) {

Thread* thread = Thread::Current();

TransitionNativeToVM transition(thread);

- const Object& obj = Object::Handle(thread->zone(),

- Api::UnwrapHandle(handle));

+ const Object& obj = Object::Handle(thread->zone(), Api::UnwrapHandle(handle));

if (!obj.IsError()) {

return Api::NewError(

"%s expects argument 'handle' to be an error handle. "

@@ -921,8 +914,8 @@ DART_EXPORT void _Dart_ReportErrorHandle(const char* file,

int line,

const char* handle,

const char* message) {

- fprintf(stderr, "%s:%d: error handle: '%s':\n '%s'\n",

- file, line, handle, message);

+ fprintf(stderr, "%s:%d: error handle: '%s':\n '%s'\n", file, line, handle,

+ message);

OS::Abort();

}

@@ -970,8 +963,8 @@ DART_EXPORT uint64_t Dart_IdentityHash(Dart_Handle obj) {

}

const Library& libcore = Library::Handle(Z, Library::CoreLibrary());

- const String& function_name = String::Handle(Z,

- String::New("identityHashCode"));

+ const String& function_name =

+ String::Handle(Z, String::New("identityHashCode"));

const Function& function =

Function::Handle(Z, libcore.LookupFunctionAllowPrivate(function_name));

if (function.IsNull()) {

@@ -1003,8 +996,8 @@ DART_EXPORT uint64_t Dart_IdentityHash(Dart_Handle obj) {

}

-DART_EXPORT Dart_Handle Dart_HandleFromPersistent(

- Dart_PersistentHandle object) {

+DART_EXPORT Dart_Handle

+Dart_HandleFromPersistent(Dart_PersistentHandle object) {

Thread* thread = Thread::Current();

Isolate* isolate = thread->isolate();

CHECK_ISOLATE(isolate);

@@ -1016,8 +1009,8 @@ DART_EXPORT Dart_Handle Dart_HandleFromPersistent(

}

-DART_EXPORT Dart_Handle Dart_HandleFromWeakPersistent(

- Dart_WeakPersistentHandle object) {

+DART_EXPORT Dart_Handle

+Dart_HandleFromWeakPersistent(Dart_WeakPersistentHandle object) {

Thread* thread = Thread::Current();

Isolate* isolate = thread->isolate();

CHECK_ISOLATE(isolate);

@@ -1068,31 +1061,25 @@ static Dart_WeakPersistentHandle AllocateFinalizableHandle(

return NULL;

}

FinalizablePersistentHandle* finalizable_ref =

- FinalizablePersistentHandle::New(thread->isolate(),

- ref,

- peer,

- callback,

+ FinalizablePersistentHandle::New(thread->isolate(), ref, peer, callback,

external_allocation_size);

return finalizable_ref->apiHandle();

}

-DART_EXPORT Dart_WeakPersistentHandle Dart_NewWeakPersistentHandle(

- Dart_Handle object,

- void* peer,

- intptr_t external_allocation_size,

- Dart_WeakPersistentHandleFinalizer callback) {

+DART_EXPORT Dart_WeakPersistentHandle

+Dart_NewWeakPersistentHandle(Dart_Handle object,

+ void* peer,

+ intptr_t external_allocation_size,

+ Dart_WeakPersistentHandleFinalizer callback) {

Thread* thread = Thread::Current();

CHECK_ISOLATE(thread->isolate());

if (callback == NULL) {

return NULL;

}

TransitionNativeToVM transition(thread);

- return AllocateFinalizableHandle(thread,

- object,

- peer,

- external_allocation_size,

- callback);

+ return AllocateFinalizableHandle(thread, object, peer,

+ external_allocation_size, callback);

}

@@ -1128,9 +1115,9 @@ DART_EXPORT void Dart_DeleteWeakPersistentHandle(

// --- Garbage Collection Callbacks --

-DART_EXPORT Dart_Handle Dart_SetGcCallbacks(

- Dart_GcPrologueCallback prologue_callback,

- Dart_GcEpilogueCallback epilogue_callback) {

+DART_EXPORT Dart_Handle

+Dart_SetGcCallbacks(Dart_GcPrologueCallback prologue_callback,

+ Dart_GcEpilogueCallback epilogue_callback) {

Thread* thread = Thread::Current();

Isolate* isolate = thread->isolate();

CHECK_ISOLATE(isolate);

@@ -1177,27 +1164,23 @@ DART_EXPORT const char* Dart_VersionString() {

DART_EXPORT char* Dart_Initialize(Dart_InitializeParams* params) {

if (params == NULL) {

- return strdup("Dart_Initialize: "

- "Dart_InitializeParams is null.");

+ return strdup(

+ "Dart_Initialize: "

+ "Dart_InitializeParams is null.");

}

if (params->version != DART_INITIALIZE_PARAMS_CURRENT_VERSION) {

- return strdup("Dart_Initialize: "

- "Invalid Dart_InitializeParams version.");

+ return strdup(

+ "Dart_Initialize: "

+ "Invalid Dart_InitializeParams version.");

}

return Dart::InitOnce(params->vm_isolate_snapshot,

- params->instructions_snapshot,

- params->data_snapshot,

- params->create,

- params->shutdown,

- params->thread_exit,

- params->file_open,

- params->file_read,

- params->file_write,

- params->file_close,

- params->entropy_source,

- params->get_service_assets);

+ params->instructions_snapshot, params->data_snapshot,

+ params->create, params->shutdown, params->thread_exit,

+ params->file_open, params->file_read,

+ params->file_write, params->file_close,

+ params->entropy_source, params->get_service_assets);

}

@@ -1223,8 +1206,7 @@ DART_EXPORT bool Dart_IsVMFlagSet(const char* flag_name) {

// --- Isolates ---

-static char* BuildIsolateName(const char* script_uri,

- const char* main) {

+static char* BuildIsolateName(const char* script_uri, const char* main) {

if (script_uri == NULL) {

// Just use the main as the name.

if (main == NULL) {

@@ -1291,11 +1273,11 @@ DART_EXPORT Dart_Isolate Dart_CreateIsolate(const char* script_uri,

const Error& error_obj =

Error::Handle(Z, Dart::InitializeIsolate(snapshot, callback_data));

if (error_obj.IsNull()) {

- #if defined(DART_NO_SNAPSHOT) && !defined(PRODUCT)

+#if defined(DART_NO_SNAPSHOT) && !defined(PRODUCT)

if (FLAG_check_function_fingerprints) {

Library::CheckFunctionFingerprints();

}

- #endif // defined(DART_NO_SNAPSHOT) && !defined(PRODUCT).

+#endif // defined(DART_NO_SNAPSHOT) && !defined(PRODUCT).

// We exit the API scope entered above.

Dart_ExitScope();

// A Thread structure has been associated to the thread, we do the

@@ -1371,9 +1353,10 @@ DART_EXPORT void Dart_EnterIsolate(Dart_Isolate isolate) {

// TODO(16615): Validate isolate parameter.

Isolate* iso = reinterpret_cast<Isolate*>(isolate);

if (!Thread::EnterIsolate(iso)) {

- FATAL("Unable to Enter Isolate : "

- "Multiple mutators entering an isolate / "

- "Dart VM is shutting down");

+ FATAL(

+ "Unable to Enter Isolate : "

+ "Multiple mutators entering an isolate / "

+ "Dart VM is shutting down");

}

// A Thread structure has been associated to the thread, we do the

// safepoint transition explicity here instead of using the

@@ -1486,10 +1469,9 @@ DART_EXPORT void Dart_SetStickyError(Dart_Handle error) {

}

if (!::Dart_IsUnhandledExceptionError(error) && !::Dart_IsNull(error)) {

FATAL1("%s expects the error to be an unhandled exception error or null.",

- CURRENT_FUNC);

+ CURRENT_FUNC);

}

- isolate->SetStickyError(

- Api::UnwrapErrorHandle(Z, error).raw());

+ isolate->SetStickyError(Api::UnwrapErrorHandle(Z, error).raw());

}

@@ -1508,8 +1490,7 @@ DART_EXPORT Dart_Handle Dart_GetStickyError() {

CHECK_ISOLATE(I);

NoSafepointScope no_safepoint_scope;

if (I->sticky_error() != Error::null()) {

- Dart_Handle error =

- Api::NewHandle(T, I->sticky_error());

+ Dart_Handle error = Api::NewHandle(T, I->sticky_error());

return error;

}

return Dart_Null();

@@ -1533,16 +1514,17 @@ DART_EXPORT void Dart_ExitIsolate() {

static uint8_t* ApiReallocate(uint8_t* ptr,

intptr_t old_size,

intptr_t new_size) {

- return Api::TopScope(Thread::Current())->zone()->Realloc<uint8_t>(

- ptr, old_size, new_size);

+ return Api::TopScope(Thread::Current())

+ ->zone()

+ ->Realloc<uint8_t>(ptr, old_size, new_size);

}

-DART_EXPORT Dart_Handle Dart_CreateSnapshot(

- uint8_t** vm_isolate_snapshot_buffer,

- intptr_t* vm_isolate_snapshot_size,

- uint8_t** isolate_snapshot_buffer,

- intptr_t* isolate_snapshot_size) {

+DART_EXPORT Dart_Handle

+Dart_CreateSnapshot(uint8_t** vm_isolate_snapshot_buffer,

+ intptr_t* vm_isolate_snapshot_size,

+ uint8_t** isolate_snapshot_buffer,

+ intptr_t* isolate_snapshot_size) {

DARTSCOPE(Thread::Current());

API_TIMELINE_DURATION;

Isolate* I = T->isolate();

@@ -1550,8 +1532,7 @@ DART_EXPORT Dart_Handle Dart_CreateSnapshot(

return Api::NewError(

"Creating full snapshots requires --load_deferred_eagerly");

}

- if (vm_isolate_snapshot_buffer != NULL &&

- vm_isolate_snapshot_size == NULL) {

+ if (vm_isolate_snapshot_buffer != NULL && vm_isolate_snapshot_size == NULL) {

RETURN_NULL_ERROR(vm_isolate_snapshot_size);

}

if (isolate_snapshot_buffer == NULL) {

@@ -1573,10 +1554,8 @@ DART_EXPORT Dart_Handle Dart_CreateSnapshot(

I->heap()->IterateObjects(&check_canonical);

#endif // #if defined(DEBUG)

- FullSnapshotWriter writer(Snapshot::kCore,

- vm_isolate_snapshot_buffer,

- isolate_snapshot_buffer,

- ApiReallocate,

+ FullSnapshotWriter writer(Snapshot::kCore, vm_isolate_snapshot_buffer,

+ isolate_snapshot_buffer, ApiReallocate,

NULL /* instructions_writer */);

writer.WriteFullSnapshot();

*vm_isolate_snapshot_size = writer.VmIsolateSnapshotSize();

@@ -1638,7 +1617,7 @@ DART_EXPORT Dart_Handle Dart_CreateLibrarySnapshot(Dart_Handle library,

DART_EXPORT void Dart_InterruptIsolate(Dart_Isolate isolate) {

if (isolate == NULL) {

- FATAL1("%s expects argument 'isolate' to be non-null.", CURRENT_FUNC);

+ FATAL1("%s expects argument 'isolate' to be non-null.", CURRENT_FUNC);

}

// TODO(16615): Validate isolate parameter.

TransitionNativeToVM transition(Thread::Current());

@@ -1651,7 +1630,7 @@ DART_EXPORT bool Dart_IsolateMakeRunnable(Dart_Isolate isolate) {

CHECK_NO_ISOLATE(Isolate::Current());

API_TIMELINE_DURATION;

if (isolate == NULL) {

- FATAL1("%s expects argument 'isolate' to be non-null.", CURRENT_FUNC);

+ FATAL1("%s expects argument 'isolate' to be non-null.", CURRENT_FUNC);

}

// TODO(16615): Validate isolate parameter.

Isolate* iso = reinterpret_cast<Isolate*>(isolate);

@@ -1715,17 +1694,15 @@ DART_EXPORT Dart_Handle Dart_RunLoop() {

RunLoopData data;

data.monitor = &monitor;

data.done = false;

- I->message_handler()->Run(

- Dart::thread_pool(),

- NULL, RunLoopDone, reinterpret_cast<uword>(&data));

+ I->message_handler()->Run(Dart::thread_pool(), NULL, RunLoopDone,

+ reinterpret_cast<uword>(&data));

while (!data.done) {

ml.Wait();

}

::Dart_EnterIsolate(Api::CastIsolate(I));

if (I->sticky_error() != Object::null()) {

- Dart_Handle error =

- Api::NewHandle(Thread::Current(), I->sticky_error());

+ Dart_Handle error = Api::NewHandle(Thread::Current(), I->sticky_error());

I->clear_sticky_error();

return error;

}

@@ -1817,8 +1794,8 @@ DART_EXPORT bool Dart_Post(Dart_Port port_id, Dart_Handle handle) {

// Smis and null can be sent without serialization.

RawObject* raw_obj = Api::UnwrapHandle(handle);

if (ApiObjectConverter::CanConvert(raw_obj)) {

- return PortMap::PostMessage(new Message(

- port_id, raw_obj, Message::kNormalPriority));

+ return PortMap::PostMessage(

+ new Message(port_id, raw_obj, Message::kNormalPriority));

}

const Object& object = Object::Handle(Z, raw_obj);

@@ -1826,8 +1803,8 @@ DART_EXPORT bool Dart_Post(Dart_Port port_id, Dart_Handle handle) {

MessageWriter writer(&data, &allocator, false);

writer.WriteMessage(object);

intptr_t len = writer.BytesWritten();

- return PortMap::PostMessage(new Message(

- port_id, data, len, Message::kNormalPriority));

+ return PortMap::PostMessage(

+ new Message(port_id, data, len, Message::kNormalPriority));

}

@@ -1835,8 +1812,7 @@ DART_EXPORT Dart_Handle Dart_NewSendPort(Dart_Port port_id) {

DARTSCOPE(Thread::Current());

CHECK_CALLBACK_STATE(T);

if (port_id == ILLEGAL_PORT) {

- return Api::NewError("%s: illegal port_id %" Pd64 ".",

- CURRENT_FUNC,

+ return Api::NewError("%s: illegal port_id %" Pd64 ".", CURRENT_FUNC,

port_id);

}

return Api::NewHandle(T, SendPort::New(port_id));

@@ -1880,8 +1856,7 @@ DART_EXPORT void Dart_EnterScope() {

thread->top_exit_frame_info());

ASSERT(new_scope != NULL);

} else {

- new_scope->Reinit(thread,

- thread->api_top_scope(),

+ new_scope->Reinit(thread, thread->api_top_scope(),

thread->top_exit_frame_info());

thread->set_api_reusable_scope(NULL);

}

@@ -1940,14 +1915,14 @@ DART_EXPORT bool Dart_IsNull(Dart_Handle object) {

}

-DART_EXPORT Dart_Handle Dart_ObjectEquals(Dart_Handle obj1, Dart_Handle obj2,

+DART_EXPORT Dart_Handle Dart_ObjectEquals(Dart_Handle obj1,

+ Dart_Handle obj2,

bool* value) {

DARTSCOPE(Thread::Current());

CHECK_CALLBACK_STATE(T);

const Instance& expected =

Instance::CheckedHandle(Z, Api::UnwrapHandle(obj1));

- const Instance& actual =

- Instance::CheckedHandle(Z, Api::UnwrapHandle(obj2));

+ const Instance& actual = Instance::CheckedHandle(Z, Api::UnwrapHandle(obj2));

const Object& result =

Object::Handle(Z, DartLibraryCalls::Equals(expected, actual));

if (result.IsBool()) {

@@ -1990,8 +1965,7 @@ DART_EXPORT Dart_Handle Dart_ObjectIsType(Dart_Handle object,

}

CHECK_CALLBACK_STATE(T);

Error& malformed_type_error = Error::Handle(Z);

- *value = instance.IsInstanceOf(type_obj,

- Object::null_type_arguments(),

+ *value = instance.IsInstanceOf(type_obj, Object::null_type_arguments(),

&malformed_type_error);

ASSERT(malformed_type_error.IsNull()); // Type was created from a class.

return Api::Success();

@@ -2115,12 +2089,9 @@ DART_EXPORT bool Dart_IsFuture(Dart_Handle handle) {

ASSERT(!future_class.IsNull());

const Class& obj_class = Class::Handle(Z, obj.clazz());

Error& malformed_type_error = Error::Handle(Z);

- bool is_future = obj_class.IsSubtypeOf(Object::null_type_arguments(),

- future_class,

- Object::null_type_arguments(),

- &malformed_type_error,

- NULL,

- Heap::kNew);

+ bool is_future = obj_class.IsSubtypeOf(

+ Object::null_type_arguments(), future_class,

+ Object::null_type_arguments(), &malformed_type_error, NULL, Heap::kNew);

ASSERT(malformed_type_error.IsNull()); // Type is a raw Future.

return is_future;

}

@@ -2312,8 +2283,8 @@ DART_EXPORT Dart_Handle Dart_IntegerToHexCString(Dart_Handle integer,

}

Zone* scope_zone = Api::TopScope(Thread::Current())->zone();

if (int_obj.IsSmi() || int_obj.IsMint()) {

- const Bigint& bigint = Bigint::Handle(Z,

- Bigint::NewFromInt64(int_obj.AsInt64Value()));

+ const Bigint& bigint =

+ Bigint::Handle(Z, Bigint::NewFromInt64(int_obj.AsInt64Value()));

*value = bigint.ToHexCString(scope_zone);

} else {

*value = Bigint::Cast(int_obj).ToHexCString(scope_zone);

@@ -2443,11 +2414,11 @@ DART_EXPORT Dart_Handle Dart_NewStringFromUTF32(const int32_t* utf32_array,

}

-DART_EXPORT Dart_Handle Dart_NewExternalLatin1String(

- const uint8_t* latin1_array,

- intptr_t length,

- void* peer,

- Dart_PeerFinalizer cback) {

+DART_EXPORT Dart_Handle

+Dart_NewExternalLatin1String(const uint8_t* latin1_array,

+ intptr_t length,

+ void* peer,

+ Dart_PeerFinalizer cback) {

API_TIMELINE_DURATION;

DARTSCOPE(Thread::Current());

if (latin1_array == NULL && length != 0) {

@@ -2455,11 +2426,9 @@ DART_EXPORT Dart_Handle Dart_NewExternalLatin1String(

}

CHECK_LENGTH(length, String::kMaxElements);

CHECK_CALLBACK_STATE(T);

- return Api::NewHandle(T, String::NewExternal(latin1_array,

- length,

- peer,

- cback,

- SpaceForExternal(T, length)));

+ return Api::NewHandle(T,

+ String::NewExternal(latin1_array, length, peer, cback,

+ SpaceForExternal(T, length)));

}

@@ -2474,10 +2443,7 @@ DART_EXPORT Dart_Handle Dart_NewExternalUTF16String(const uint16_t* utf16_array,

CHECK_LENGTH(length, String::kMaxElements);

CHECK_CALLBACK_STATE(T);

intptr_t bytes = length * sizeof(*utf16_array);

- return Api::NewHandle(T, String::NewExternal(utf16_array,

- length,

- peer,

- cback,

+ return Api::NewHandle(T, String::NewExternal(utf16_array, length, peer, cback,

SpaceForExternal(T, bytes)));

}

@@ -2603,8 +2569,9 @@ DART_EXPORT Dart_Handle Dart_MakeExternalString(Dart_Handle str,

Dart_PeerFinalizer cback) {

DARTSCOPE(Thread::Current());

if (!FLAG_support_externalizable_strings) {

- return Api::NewError("Dart_MakeExternalString with "

- "--support_externalizable_strings=false");

+ return Api::NewError(

+ "Dart_MakeExternalString with "

+ "--support_externalizable_strings=false");

}

const String& str_obj = Api::UnwrapStringHandle(Z, str);

if (str_obj.IsExternal()) {

@@ -2618,10 +2585,11 @@ DART_EXPORT Dart_Handle Dart_MakeExternalString(Dart_Handle str,

}

intptr_t str_size = (str_obj.Length() * str_obj.CharSize());

if ((external_size < str_size) || (external_size > String::kMaxElements)) {

- return Api::NewError("Dart_MakeExternalString "

- "expects argument external_size to be in the range"

- "[%" Pd "..%" Pd "].",

- str_size, String::kMaxElements);

+ return Api::NewError(

+ "Dart_MakeExternalString "

+ "expects argument external_size to be in the range"

+ "[%" Pd "..%" Pd "].",

+ str_size, String::kMaxElements);

}

if (str_obj.InVMHeap()) {

// Since the string object is read only we do not externalize

@@ -2648,8 +2616,8 @@ DART_EXPORT Dart_Handle Dart_MakeExternalString(Dart_Handle str,

}

return str;

}

- return Api::NewHandle(T, str_obj.MakeExternal(array, external_size,

- peer, cback));

+ return Api::NewHandle(

+ T, str_obj.MakeExternal(array, external_size, peer, cback));

}

@@ -2691,7 +2659,7 @@ DART_EXPORT Dart_Handle Dart_NewList(intptr_t length) {

type& array = type::Handle(zone); \

array ^= obj.raw(); \

*len = array.Length(); \

- return Api::Success(); \

+ return Api::Success();

DART_EXPORT Dart_Handle Dart_ListLength(Dart_Handle list, intptr_t* len) {

@@ -2733,7 +2701,7 @@ DART_EXPORT Dart_Handle Dart_ListLength(Dart_Handle list, intptr_t* len) {

const Array& args = Array::Handle(Z, Array::New(kNumArgs));

args.SetAt(0, instance); // Set up the receiver as the first argument.

const Object& retval =

- Object::Handle(Z, DartEntry::InvokeFunction(function, args));

+ Object::Handle(Z, DartEntry::InvokeFunction(function, args));

if (retval.IsSmi()) {

*len = Smi::Cast(retval).Value();

return Api::Success();

@@ -2754,8 +2722,9 @@ DART_EXPORT Dart_Handle Dart_ListLength(Dart_Handle list, intptr_t* len) {

}

- return Api::NewError("Length of List object is greater than the "

- "maximum value that 'len' parameter can hold");

+ return Api::NewError(

+ "Length of List object is greater than the "

+ "maximum value that 'len' parameter can hold");

} else if (retval.IsError()) {

return Api::NewHandle(T, retval.raw());

} else {

@@ -2769,7 +2738,7 @@ DART_EXPORT Dart_Handle Dart_ListLength(Dart_Handle list, intptr_t* len) {

if ((index >= 0) && (index < array_obj.Length())) { \

return Api::NewHandle(thread, array_obj.At(index)); \

} \

- return Api::NewError("Invalid index passed in to access list element"); \

+ return Api::NewError("Invalid index passed in to access list element");

DART_EXPORT Dart_Handle Dart_ListGetAt(Dart_Handle list, intptr_t index) {

@@ -2786,10 +2755,9 @@ DART_EXPORT Dart_Handle Dart_ListGetAt(Dart_Handle list, intptr_t index) {

// Check and handle a dart object that implements the List interface.

const Instance& instance = Instance::Handle(Z, GetListInstance(Z, obj));

if (!instance.IsNull()) {

- return Api::NewHandle(T, Send1Arg(

- instance,

- Symbols::IndexToken(),

- Instance::Handle(Z, Integer::New(index))));

+ return Api::NewHandle(T,

+ Send1Arg(instance, Symbols::IndexToken(),

+ Instance::Handle(Z, Integer::New(index))));

}

return Api::NewError("Object does not implement the 'List' interface");

}

@@ -2804,7 +2772,7 @@ DART_EXPORT Dart_Handle Dart_ListGetAt(Dart_Handle list, intptr_t index) {

} \

return Api::Success(); \

} \

- return Api::NewError("Invalid offset/length passed in to access list"); \

+ return Api::NewError("Invalid offset/length passed in to access list");

DART_EXPORT Dart_Handle Dart_ListGetRange(Dart_Handle list,

@@ -2830,10 +2798,9 @@ DART_EXPORT Dart_Handle Dart_ListGetRange(Dart_Handle list,

const intptr_t kNumArgs = 2;

ArgumentsDescriptor args_desc(

Array::Handle(ArgumentsDescriptor::New(kNumArgs)));

- const Function& function = Function::Handle(Z,

- Resolver::ResolveDynamic(instance,

- Symbols::AssignIndexToken(),

- args_desc));

+ const Function& function = Function::Handle(

+ Z, Resolver::ResolveDynamic(instance, Symbols::AssignIndexToken(),

+ args_desc));

if (!function.IsNull()) {

const Array& args = Array::Handle(Array::New(kNumArgs));

args.SetAt(0, instance);

@@ -2841,10 +2808,9 @@ DART_EXPORT Dart_Handle Dart_ListGetRange(Dart_Handle list,

for (intptr_t i = 0; i < length; ++i) {

index = Integer::New(i);

args.SetAt(1, index);

- Dart_Handle value = Api::NewHandle(

- T, DartEntry::InvokeFunction(function, args));

- if (::Dart_IsError(value))

- return value;

+ Dart_Handle value =

+ Api::NewHandle(T, DartEntry::InvokeFunction(function, args));

+ if (::Dart_IsError(value)) return value;

result[i] = value;

}

return Api::Success();

@@ -2865,7 +2831,7 @@ DART_EXPORT Dart_Handle Dart_ListGetRange(Dart_Handle list,

array.SetAt(index, value_obj); \

return Api::Success(); \

} \

- return Api::NewError("Invalid index passed in to set list element"); \

+ return Api::NewError("Invalid index passed in to set list element");

DART_EXPORT Dart_Handle Dart_ListSetAt(Dart_Handle list,

@@ -2890,10 +2856,9 @@ DART_EXPORT Dart_Handle Dart_ListSetAt(Dart_Handle list,

const intptr_t kNumArgs = 3;

ArgumentsDescriptor args_desc(

Array::Handle(ArgumentsDescriptor::New(kNumArgs)));

- const Function& function = Function::Handle(Z,

- Resolver::ResolveDynamic(instance,

- Symbols::AssignIndexToken(),

- args_desc));

+ const Function& function = Function::Handle(

+ Z, Resolver::ResolveDynamic(instance, Symbols::AssignIndexToken(),

+ args_desc));

if (!function.IsNull()) {

const Integer& index_obj = Integer::Handle(Z, Integer::New(index));

const Object& value_obj = Object::Handle(Z, Api::UnwrapHandle(value));

@@ -2904,8 +2869,7 @@ DART_EXPORT Dart_Handle Dart_ListSetAt(Dart_Handle list,

args.SetAt(0, instance);

args.SetAt(1, index_obj);

args.SetAt(2, value_obj);

- return Api::NewHandle(

- T, DartEntry::InvokeFunction(function, args));

+ return Api::NewHandle(T, DartEntry::InvokeFunction(function, args));

}

return Api::NewError("Object does not implement the 'List' interface");

@@ -2926,16 +2890,15 @@ static RawObject* ThrowArgumentError(const char* exception_message) {

// Lookup the class ArgumentError in dart:core.

const String& lib_url = String::Handle(String::New("dart:core"));

const String& class_name = String::Handle(String::New("ArgumentError"));

- const Library& lib = Library::Handle(zone,

- Library::LookupLibrary(thread, lib_url));

+ const Library& lib =

+ Library::Handle(zone, Library::LookupLibrary(thread, lib_url));

if (lib.IsNull()) {

- const String& message = String::Handle(

- String::NewFormatted("%s: library '%s' not found.",

- CURRENT_FUNC, lib_url.ToCString()));

+ const String& message = String::Handle(String::NewFormatted(

+ "%s: library '%s' not found.", CURRENT_FUNC, lib_url.ToCString()));

return ApiError::New(message);

}

- const Class& cls = Class::Handle(

- zone, lib.LookupClassAllowPrivate(class_name));

+ const Class& cls =

+ Class::Handle(zone, lib.LookupClassAllowPrivate(class_name));

ASSERT(!cls.IsNull());

Object& result = Object::Handle(zone);

String& dot_name = String::Handle(String::New("."));

@@ -2964,7 +2927,7 @@ static RawObject* ThrowArgumentError(const char* exception_message) {

// There are no dart frames on the stack so it would be illegal to

// throw an exception here.

const String& message = String::Handle(

- String::New("No Dart frames on stack, cannot throw exception"));

+ String::New("No Dart frames on stack, cannot throw exception"));

return ApiError::New(message);

}

// Unwind all the API scopes till the exit frame before throwing an

@@ -2977,8 +2940,8 @@ static RawObject* ThrowArgumentError(const char* exception_message) {

saved_exception = &Instance::Handle(raw_exception);

}

Exceptions::Throw(thread, *saved_exception);

- const String& message = String::Handle(

- String::New("Exception was not thrown, internal error"));

+ const String& message =

+ String::Handle(String::New("Exception was not thrown, internal error"));

return ApiError::New(message);

}

@@ -2992,7 +2955,6 @@ static RawObject* ThrowArgumentError(const char* exception_message) {

if (!element.IsInteger()) { \

return Api::NewHandle( \

T, ThrowArgumentError("List contains non-int elements")); \

- \

} \

const Integer& integer = Integer::Cast(element); \

native_array[i] = static_cast<uint8_t>(integer.AsInt64Value() & 0xff); \

@@ -3000,17 +2962,16 @@ static RawObject* ThrowArgumentError(const char* exception_message) {

} \

return Api::Success(); \

} \

- return Api::NewError("Invalid length passed in to access array elements"); \

+ return Api::NewError("Invalid length passed in to access array elements");

-template<typename T>

+template <typename T>

static Dart_Handle CopyBytes(const T& array,

intptr_t offset,

uint8_t* native_array,

intptr_t length) {

ASSERT(array.ElementSizeInBytes() == 1);

NoSafepointScope no_safepoint;

- memmove(native_array,

- reinterpret_cast<uint8_t*>(array.DataAddr(offset)),

+ memmove(native_array, reinterpret_cast<uint8_t*>(array.DataAddr(offset)),

length);

return Api::Success();

}

@@ -3067,8 +3028,8 @@ DART_EXPORT Dart_Handle Dart_ListGetAsBytes(Dart_Handle list,

GET_LIST_ELEMENT_AS_BYTES(Array, obj, native_array, offset, length);

}

if (obj.IsGrowableObjectArray()) {

- GET_LIST_ELEMENT_AS_BYTES(

- GrowableObjectArray, obj, native_array, offset, length);

+ GET_LIST_ELEMENT_AS_BYTES(GrowableObjectArray, obj, native_array, offset,

+ length);

}

if (obj.IsError()) {

return list;

@@ -3076,13 +3037,13 @@ DART_EXPORT Dart_Handle Dart_ListGetAsBytes(Dart_Handle list,

CHECK_CALLBACK_STATE(T);

// Check and handle a dart object that implements the List interface.

- const Instance& instance =

- Instance::Handle(Z, GetListInstance(Z, obj));

+ const Instance& instance = Instance::Handle(Z, GetListInstance(Z, obj));

if (!instance.IsNull()) {

const int kNumArgs = 2;

ArgumentsDescriptor args_desc(

Array::Handle(ArgumentsDescriptor::New(kNumArgs)));

- const Function& function = Function::Handle(Z,

+ const Function& function = Function::Handle(

+ Z,

Resolver::ResolveDynamic(instance, Symbols::IndexToken(), args_desc));

if (!function.IsNull()) {

Object& result = Object::Handle(Z);

@@ -3098,8 +3059,10 @@ DART_EXPORT Dart_Handle Dart_ListGetAsBytes(Dart_Handle list,

return Api::NewHandle(T, result.raw());

}

if (!result.IsInteger()) {

- return Api::NewError("%s expects the argument 'list' to be "

- "a List of int", CURRENT_FUNC);

+ return Api::NewError(

+ "%s expects the argument 'list' to be "

+ "a List of int",

+ CURRENT_FUNC);

}

const Integer& integer_result = Integer::Cast(result);

ASSERT(integer_result.AsInt64Value() <= 0xff);

@@ -3125,7 +3088,7 @@ DART_EXPORT Dart_Handle Dart_ListGetAsBytes(Dart_Handle list,

} \

return Api::Success(); \

} \

- return Api::NewError("Invalid length passed in to set array elements"); \

+ return Api::NewError("Invalid length passed in to set array elements");

DART_EXPORT Dart_Handle Dart_ListSetAsBytes(Dart_Handle list,

@@ -3140,8 +3103,7 @@ DART_EXPORT Dart_Handle Dart_ListSetAsBytes(Dart_Handle list,

if (Utils::RangeCheck(offset, length, array.Length())) {

NoSafepointScope no_safepoint;

memmove(reinterpret_cast<uint8_t*>(array.DataAddr(offset)),

- native_array,

- length);

+ native_array, length);

return Api::Success();

}

return Api::NewError("Invalid length passed in to access list elements");

@@ -3153,8 +3115,8 @@ DART_EXPORT Dart_Handle Dart_ListSetAsBytes(Dart_Handle list,

SET_LIST_ELEMENT_AS_BYTES(Array, obj, native_array, offset, length);

}

if (obj.IsGrowableObjectArray()) {

- SET_LIST_ELEMENT_AS_BYTES(

- GrowableObjectArray, obj, native_array, offset, length);

+ SET_LIST_ELEMENT_AS_BYTES(GrowableObjectArray, obj, native_array, offset,

+ length);

}

if (obj.IsError()) {

return list;

@@ -3167,10 +3129,9 @@ DART_EXPORT Dart_Handle Dart_ListSetAsBytes(Dart_Handle list,

const int kNumArgs = 3;

ArgumentsDescriptor args_desc(

Array::Handle(ArgumentsDescriptor::New(kNumArgs)));

- const Function& function = Function::Handle(Z,

- Resolver::ResolveDynamic(instance,

- Symbols::AssignIndexToken(),

- args_desc));

+ const Function& function = Function::Handle(

+ Z, Resolver::ResolveDynamic(instance, Symbols::AssignIndexToken(),

+ args_desc));

if (!function.IsNull()) {

Integer& indexobj = Integer::Handle(Z);

Integer& valueobj = Integer::Handle(Z);

@@ -3181,8 +3142,8 @@ DART_EXPORT Dart_Handle Dart_ListSetAsBytes(Dart_Handle list,

valueobj = Integer::New(native_array[i]);

args.SetAt(1, indexobj);

args.SetAt(2, valueobj);

- const Object& result = Object::Handle(Z,

- DartEntry::InvokeFunction(function, args));

+ const Object& result =

+ Object::Handle(Z, DartEntry::InvokeFunction(function, args));

if (result.IsError()) {

return Api::NewHandle(T, result.raw());

}

@@ -3223,10 +3184,9 @@ DART_EXPORT Dart_Handle Dart_MapContainsKey(Dart_Handle map, Dart_Handle key) {

if (!(key_obj.IsInstance() || key_obj.IsNull())) {

return Api::NewError("Key is not an instance");

}

- return Api::NewHandle(T, Send1Arg(

- instance,

- String::Handle(Z, String::New("containsKey")),

- Instance::Cast(key_obj)));

+ return Api::NewHandle(

+ T, Send1Arg(instance, String::Handle(Z, String::New("containsKey")),

+ Instance::Cast(key_obj)));

}

return Api::NewError("Object does not implement the 'Map' interface");

}

@@ -3238,14 +3198,13 @@ DART_EXPORT Dart_Handle Dart_MapKeys(Dart_Handle map) {

Object& obj = Object::Handle(Z, Api::UnwrapHandle(map));

Instance& instance = Instance::Handle(Z, GetMapInstance(Z, obj));

if (!instance.IsNull()) {

- const Object& iterator = Object::Handle(Send0Arg(

- instance, String::Handle(Z, String::New("get:keys"))));

+ const Object& iterator = Object::Handle(

+ Send0Arg(instance, String::Handle(Z, String::New("get:keys"))));

if (!iterator.IsInstance()) {

return Api::NewHandle(T, iterator.raw());

}

- return Api::NewHandle(T, Send0Arg(

- Instance::Cast(iterator),

- String::Handle(String::New("toList"))));

+ return Api::NewHandle(T, Send0Arg(Instance::Cast(iterator),

+ String::Handle(String::New("toList"))));

}

return Api::NewError("Object does not implement the 'Map' interface");

}

@@ -3257,67 +3216,67 @@ DART_EXPORT Dart_Handle Dart_MapKeys(Dart_Handle map) {

static Dart_TypedData_Type GetType(intptr_t class_id) {

Dart_TypedData_Type type;

switch (class_id) {

- case kByteDataViewCid :

+ case kByteDataViewCid:

type = Dart_TypedData_kByteData;

break;

- case kTypedDataInt8ArrayCid :

- case kTypedDataInt8ArrayViewCid :

- case kExternalTypedDataInt8ArrayCid :

+ case kTypedDataInt8ArrayCid:

+ case kTypedDataInt8ArrayViewCid:

+ case kExternalTypedDataInt8ArrayCid:

type = Dart_TypedData_kInt8;

break;

- case kTypedDataUint8ArrayCid :

- case kTypedDataUint8ArrayViewCid :

- case kExternalTypedDataUint8ArrayCid :

+ case kTypedDataUint8ArrayCid:

+ case kTypedDataUint8ArrayViewCid:

+ case kExternalTypedDataUint8ArrayCid:

type = Dart_TypedData_kUint8;

break;

- case kTypedDataUint8ClampedArrayCid :

- case kTypedDataUint8ClampedArrayViewCid :

- case kExternalTypedDataUint8ClampedArrayCid :

+ case kTypedDataUint8ClampedArrayCid:

+ case kTypedDataUint8ClampedArrayViewCid:

+ case kExternalTypedDataUint8ClampedArrayCid:

type = Dart_TypedData_kUint8Clamped;

break;

- case kTypedDataInt16ArrayCid :

- case kTypedDataInt16ArrayViewCid :

- case kExternalTypedDataInt16ArrayCid :

+ case kTypedDataInt16ArrayCid:

+ case kTypedDataInt16ArrayViewCid:

+ case kExternalTypedDataInt16ArrayCid:

type = Dart_TypedData_kInt16;

break;

- case kTypedDataUint16ArrayCid :

- case kTypedDataUint16ArrayViewCid :

- case kExternalTypedDataUint16ArrayCid :

+ case kTypedDataUint16ArrayCid:

+ case kTypedDataUint16ArrayViewCid:

+ case kExternalTypedDataUint16ArrayCid:

type = Dart_TypedData_kUint16;

break;

- case kTypedDataInt32ArrayCid :

- case kTypedDataInt32ArrayViewCid :

- case kExternalTypedDataInt32ArrayCid :

+ case kTypedDataInt32ArrayCid:

+ case kTypedDataInt32ArrayViewCid:

+ case kExternalTypedDataInt32ArrayCid:

type = Dart_TypedData_kInt32;

break;

- case kTypedDataUint32ArrayCid :

- case kTypedDataUint32ArrayViewCid :

- case kExternalTypedDataUint32ArrayCid :

+ case kTypedDataUint32ArrayCid:

+ case kTypedDataUint32ArrayViewCid:

+ case kExternalTypedDataUint32ArrayCid:

type = Dart_TypedData_kUint32;

break;

- case kTypedDataInt64ArrayCid :

- case kTypedDataInt64ArrayViewCid :

- case kExternalTypedDataInt64ArrayCid :

+ case kTypedDataInt64ArrayCid:

+ case kTypedDataInt64ArrayViewCid:

+ case kExternalTypedDataInt64ArrayCid:

type = Dart_TypedData_kInt64;

break;

- case kTypedDataUint64ArrayCid :

- case kTypedDataUint64ArrayViewCid :

- case kExternalTypedDataUint64ArrayCid :

+ case kTypedDataUint64ArrayCid:

+ case kTypedDataUint64ArrayViewCid:

+ case kExternalTypedDataUint64ArrayCid:

type = Dart_TypedData_kUint64;

break;

- case kTypedDataFloat32ArrayCid :

- case kTypedDataFloat32ArrayViewCid :

- case kExternalTypedDataFloat32ArrayCid :

+ case kTypedDataFloat32ArrayCid:

+ case kTypedDataFloat32ArrayViewCid:

+ case kExternalTypedDataFloat32ArrayCid:

type = Dart_TypedData_kFloat32;

break;

- case kTypedDataFloat64ArrayCid :

- case kTypedDataFloat64ArrayViewCid :

- case kExternalTypedDataFloat64ArrayCid :

+ case kTypedDataFloat64ArrayCid:

+ case kTypedDataFloat64ArrayViewCid:

+ case kExternalTypedDataFloat64ArrayCid:

type = Dart_TypedData_kFloat64;

break;

- case kTypedDataFloat32x4ArrayCid :

- case kTypedDataFloat32x4ArrayViewCid :

- case kExternalTypedDataFloat32x4ArrayCid :

+ case kTypedDataFloat32x4ArrayCid:

+ case kTypedDataFloat32x4ArrayViewCid:

+ case kExternalTypedDataFloat32x4ArrayCid:

type = Dart_TypedData_kFloat32x4;

break;

default:

@@ -3339,8 +3298,8 @@ DART_EXPORT Dart_TypedData_Type Dart_GetTypeOfTypedData(Dart_Handle object) {

}

-DART_EXPORT Dart_TypedData_Type Dart_GetTypeOfExternalTypedData(

- Dart_Handle object) {

+DART_EXPORT Dart_TypedData_Type

+Dart_GetTypeOfExternalTypedData(Dart_Handle object) {

API_TIMELINE_DURATION;

intptr_t class_id = Api::ClassId(object);

if (RawObject::IsExternalTypedDataClassId(class_id)) {

@@ -3370,11 +3329,8 @@ static RawObject* GetByteDataConstructor(Thread* thread,

const Class& cls = Class::Handle(

thread->zone(), lib.LookupClassAllowPrivate(Symbols::ByteData()));

ASSERT(!cls.IsNull());

- return ResolveConstructor(CURRENT_FUNC,

- cls,

- Symbols::ByteData(),

- constructor_name,

- num_args);

+ return ResolveConstructor(CURRENT_FUNC, cls, Symbols::ByteData(),

+ constructor_name, num_args);

}

@@ -3401,31 +3357,29 @@ static Dart_Handle NewByteData(Thread* thread, intptr_t length) {

}

-static Dart_Handle NewTypedData(Thread* thread,

- intptr_t cid,

- intptr_t length) {

+static Dart_Handle NewTypedData(Thread* thread, intptr_t cid, intptr_t length) {

CHECK_LENGTH(length, TypedData::MaxElements(cid));

return Api::NewHandle(thread, TypedData::New(cid, length));

}

-static Dart_Handle NewExternalTypedData(

- Thread* thread, intptr_t cid, void* data, intptr_t length) {

+static Dart_Handle NewExternalTypedData(Thread* thread,

+ intptr_t cid,

+ void* data,

+ intptr_t length) {

CHECK_LENGTH(length, ExternalTypedData::MaxElements(cid));

Zone* zone = thread->zone();

intptr_t bytes = length * ExternalTypedData::ElementSizeInBytes(cid);

const ExternalTypedData& result = ExternalTypedData::Handle(

- zone,

- ExternalTypedData::New(cid,

- reinterpret_cast<uint8_t*>(data),

- length,

- SpaceForExternal(thread, bytes)));

+ zone, ExternalTypedData::New(cid, reinterpret_cast<uint8_t*>(data),

+ length, SpaceForExternal(thread, bytes)));

return Api::NewHandle(thread, result.raw());

}

-static Dart_Handle NewExternalByteData(

- Thread* thread, void* data, intptr_t length) {

+static Dart_Handle NewExternalByteData(Thread* thread,

+ void* data,

+ intptr_t length) {

Zone* zone = thread->zone();

Dart_Handle ext_data = NewExternalTypedData(

thread, kExternalTypedDataUint8ArrayCid, data, length);

@@ -3465,29 +3419,29 @@ DART_EXPORT Dart_Handle Dart_NewTypedData(Dart_TypedData_Type type,

DARTSCOPE(Thread::Current());

CHECK_CALLBACK_STATE(T);

switch (type) {

- case Dart_TypedData_kByteData :

+ case Dart_TypedData_kByteData:

return NewByteData(T, length);

- case Dart_TypedData_kInt8 :

+ case Dart_TypedData_kInt8:

return NewTypedData(T, kTypedDataInt8ArrayCid, length);

- case Dart_TypedData_kUint8 :

+ case Dart_TypedData_kUint8:

return NewTypedData(T, kTypedDataUint8ArrayCid, length);

- case Dart_TypedData_kUint8Clamped :

+ case Dart_TypedData_kUint8Clamped:

return NewTypedData(T, kTypedDataUint8ClampedArrayCid, length);

- case Dart_TypedData_kInt16 :

+ case Dart_TypedData_kInt16:

return NewTypedData(T, kTypedDataInt16ArrayCid, length);

- case Dart_TypedData_kUint16 :

+ case Dart_TypedData_kUint16:

return NewTypedData(T, kTypedDataUint16ArrayCid, length);

- case Dart_TypedData_kInt32 :

+ case Dart_TypedData_kInt32:

return NewTypedData(T, kTypedDataInt32ArrayCid, length);

- case Dart_TypedData_kUint32 :

+ case Dart_TypedData_kUint32:

return NewTypedData(T, kTypedDataUint32ArrayCid, length);

- case Dart_TypedData_kInt64 :

+ case Dart_TypedData_kInt64:

return NewTypedData(T, kTypedDataInt64ArrayCid, length);

- case Dart_TypedData_kUint64 :

+ case Dart_TypedData_kUint64:

return NewTypedData(T, kTypedDataUint64ArrayCid, length);

- case Dart_TypedData_kFloat32 :

- return NewTypedData(T, kTypedDataFloat32ArrayCid, length);

- case Dart_TypedData_kFloat64 :

+ case Dart_TypedData_kFloat32:

+ return NewTypedData(T, kTypedDataFloat32ArrayCid, length);

+ case Dart_TypedData_kFloat64:

return NewTypedData(T, kTypedDataFloat64ArrayCid, length);

case Dart_TypedData_kFloat32x4:

return NewTypedData(T, kTypedDataFloat32x4ArrayCid, length);

@@ -3500,10 +3454,9 @@ DART_EXPORT Dart_Handle Dart_NewTypedData(Dart_TypedData_Type type,

}

-DART_EXPORT Dart_Handle Dart_NewExternalTypedData(

- Dart_TypedData_Type type,

- void* data,

- intptr_t length) {

+DART_EXPORT Dart_Handle Dart_NewExternalTypedData(Dart_TypedData_Type type,

+ void* data,

+ intptr_t length) {

DARTSCOPE(Thread::Current());

if (data == NULL && length != 0) {

RETURN_NULL_ERROR(data);

@@ -3513,44 +3466,46 @@ DART_EXPORT Dart_Handle Dart_NewExternalTypedData(

case Dart_TypedData_kByteData:

return NewExternalByteData(T, data, length);

case Dart_TypedData_kInt8: