subType of null messing up WebStorm debugging

third_party/WebKit/Source/bindings/core/dart/DartInjectedScript.cpp

 /*
  * Copyright (C) 2014 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 432 matching lines @@
     OwnPtr<protocol::Runtime::StackTrace> stack = protocol::Runtime::StackTrace::create()
         .setCallFrames(frames.release()).build();
 
     return stack.release();
 }
 
 void DartInjectedScript::packageObjectResult(Dart_Handle dartHandle, const String& objectGroup, ErrorString* errorString, bool returnByValue, bool generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown)
 {
     ASSERT(Dart_IsInstance(dartHandle) || Dart_IsNull(dartHandle));
 
-    *result = NULL;
-
     // FIXMEDART: support returnByValue for Dart types that are expressible as JSON.
     bool wasThrownVal = false;
     Dart_Handle exception = 0;
     if (Dart_IsError(dartHandle)) {
         wasThrownVal = true;
         Dart_Handle exception = Dart_ErrorGetException(dartHandle);
         ASSERT(Dart_IsInstance(exception));
         if (!Dart_IsInstance(exception)) {
             *errorString = Dart_GetError(dartHandle);
             return;
@@ skipping 39 matching lines @@
         if (exception) {
             description = String::format("Instance of '%s'", typeName.utf8().data());
             exception = 0;
         }
         ASSERT(!exception);
 
         if (DartUtilities::isNode(dartHandle))
             isNode = true;
     }
 
-    const char* remoteType;
+    const char* remoteType = nullptr;
     const char* remoteSubType = nullptr;
     switch (value->type()) {
     case protocol::Value::TypeBoolean:
       remoteType = protocol::Runtime::RemoteObject::TypeEnum::Boolean;
       break;
     case protocol::Value::TypeNumber:
       remoteType = protocol::Runtime::RemoteObject::TypeEnum::Number;
       break;
     case protocol::Value::TypeString:
       remoteType = protocol::Runtime::RemoteObject::TypeEnum::String;
       break;
     case protocol::Value::TypeObject:
       remoteType = protocol::Runtime::RemoteObject::TypeEnum::Object;
       break;
     case protocol::Value::TypeArray:
       remoteType = protocol::Runtime::RemoteObject::TypeEnum::Object;
       remoteSubType = protocol::Runtime::RemoteObject::SubtypeEnum::Array;
       break;
     case protocol::Value::TypeNull:
     default:
       remoteType = protocol::Runtime::RemoteObject::TypeEnum::Object;
-      remoteSubType = protocol::Runtime::RemoteObject::SubtypeEnum::Null;
       break;
     }
 
     OwnPtr<protocol::Runtime::RemoteObject> remoteObject = protocol::Runtime::RemoteObject::create()
       .setType(remoteType)
       .setLanguage("Dart")
       .setClassName(typeName)
       .setDescription(description)
       .build();
     if (value)
@@ skipping 1001 matching lines @@
     RefPtr<JSONValue> parsedObjectId = parseJSON(objectId);
     if (parsedObjectId && parsedObjectId->type() == JSONValue::TypeObject) {
         bool isDart = false;
         bool success = JSONObject::cast(parsedObjectId)-> getBoolean("isDart", &isDart);
         return success && isDart;
     }
     return false;
 }
 
 } // namespace blink