Fix for https://code.google.com/p/dart/issues/detail?id=5851 Proper line #s and columns for Dart er…

Source/bindings/dart/DartController.cpp

 // Copyright (c) 2009, 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 182 matching lines @@
         // navigation.
         Dart_Handle localHandle = DartDocument::toDart(document);
         Dart_PersistentHandle strongHandle = Dart_NewPersistentHandle(localHandle);
         // We need a weak handle to always reachable object to temporary render
         // so weak handles strong, see the corresponding logic in
         // DartGCController.
         domData->setReachableWeakHandle(Dart_NewWeakPersistentHandle(localHandle, 0, 0));
 
         DartDebugServer::shared().registerIsolate(isolate);
     }
+
     return isolate;
 }
 
 void DartController::createDOMEnabledIsolateIfNeeded(const String& scriptURL, const String& entryPoint, Document* document)
 {
     if (m_isolate) {
         Dart_EnterIsolate(m_isolate);
         return;
     }
     // FIXME: proper error reporting.
@@ skipping 662 matching lines @@
 {
     if (!m_isolate)
         return;
 
     v8::HandleScope handleScope;
     v8::Handle<v8::Context> v8Context = v8ScriptState->context();
 
     collectScriptStatesForIsolate(m_isolate, v8Context, result);
 }
 
+LibraryIdMap* DartController::libraryIdMapForIsolate(Dart_Isolate isolate)
+{
+    LibraryIdMap* libraryIdMap;
+    ScriptStatesMap::iterator it = m_scriptStates.find(isolate);
+    if (it == m_scriptStates.end()) {
+        libraryIdMap = new LibraryIdMap();
+        m_scriptStates.set(isolate, libraryIdMap);
+    } else {
+        libraryIdMap = it->value;
+    }
+    return libraryIdMap;
+}
+
+DartScriptState* DartController::lookupScriptState(Dart_Isolate isolate, v8::Handle<v8::Context> v8Context, intptr_t libraryId)
+{
+    return lookupScriptStateFromLibraryIdMap(isolate, v8Context, libraryIdMapForIsolate(isolate), libraryId);
+}
+
+DartScriptState* DartController::lookupScriptStateFromLibraryIdMap(Dart_Isolate isolate, v8::Handle<v8::Context> v8Context, LibraryIdMap* libraryIdMap, intptr_t libraryId)
+{
+    // -1 cannot be used as a HashMap key however library ids are
+    // guaranteed to be non-negative so it is a non-issue.
+    ASSERT(libraryId >= 0);
+    // 0 cannot be used as a HashMap key so we add 1 to the library id to
+    // create a valid key.
+    intptr_t libraryIdKey = libraryId + 1;
+    LibraryIdMap::iterator libraryIter = libraryIdMap->find(libraryIdKey);
+    DartScriptState* scriptState;
+    if (libraryIter == libraryIdMap->end()) {
+        scriptState = new DartScriptState(isolate, libraryId, v8Context);
+        libraryIdMap->set(libraryIdKey, scriptState);
+    } else {
+        scriptState = libraryIter->value;
+        ASSERT(scriptState);
+    }
+    return scriptState;
+}
+
 void DartController::collectScriptStatesForIsolate(Dart_Isolate isolate, v8::Handle<v8::Context> v8Context, Vector<ScriptState*>& result)
 {
     if (!isolate)
         return;
     DartIsolateScope scope(isolate);
     DartApiScope apiScope;
-    ScriptStatesMap::iterator it = m_scriptStates.find(isolate);
-    LibraryIdMap* libraryIdMap;
-    if (it == m_scriptStates.end()) {
-        libraryIdMap = new LibraryIdMap();
-        m_scriptStates.set(isolate, libraryIdMap);
-    } else {
-        libraryIdMap = it->value;
-    }
+    LibraryIdMap* libraryIdMap = libraryIdMapForIsolate(isolate);
     Dart_Handle libraryIdList = Dart_GetLibraryIds();
 
     intptr_t length = 0;
     Dart_Handle res = Dart_ListLength(libraryIdList, &length);
 
     for (intptr_t i = 0; i < length; i++) {
         Dart_Handle libraryIdHandle = Dart_ListGetAt(libraryIdList, i);
         Dart_Handle exception = 0;
         intptr_t libraryId = DartUtilities::toInteger(libraryIdHandle, exception);
         ASSERT(!exception);
-        // -1 cannot be used as a HashMap key however library ids are
-        // guaranteed to be non-negative so it is a non-issue.
-        ASSERT(libraryId >= 0);
-        // 0 cannot be used as a HashMap key so we add 1 to the library id to
-        // create a valid key.
-        intptr_t libraryIdKey = libraryId + 1;
-        LibraryIdMap::iterator libraryIter = libraryIdMap->find(libraryIdKey);
-        DartScriptState* scriptState;
-        if (libraryIter == libraryIdMap->end()) {
-            scriptState = new DartScriptState(isolate, libraryId, v8Context);
-            libraryIdMap->set(libraryIdKey, scriptState);
-        } else {
-            scriptState = libraryIter->value;
-            ASSERT(scriptState);
-        }
+        DartScriptState* scriptState = lookupScriptStateFromLibraryIdMap(isolate, v8Context, libraryIdMap, libraryId);
         result.append(scriptState);
     }
 }
 
 }