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

Source/bindings/dart/DartController.h

 // 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 35 matching lines @@
 class DartApplicationLoader;
 class DartAsyncLoader;
 class DartDOMData;
 class DartScriptState;
 class DOMWindow;
 class Frame;
 class ScriptElementProxy;
 class ScriptExecutionContext;
 class ScriptState;
 
+typedef HashMap<intptr_t, DartScriptState*> LibraryIdMap;
+typedef HashMap<Dart_Isolate, LibraryIdMap*> ScriptStatesMap;
+
 // This class provides the linkage between a Frame and its attached
 // Dart isolates. It is similar to ScriptController for JavaScript.
 // The DartController is owned by its Frame.
 class DartController {
 public:
     DartController(Frame*);
     virtual ~DartController();
 
     void evaluate(const ScriptSourceCode&);
     void isolatedWorldCreated(v8::Handle<v8::Context>);
 
     // Exposes NPObject instance to Dart environment.
     void bindToWindowObject(Frame*, const String& key, NPObject*);
     NPObject* npObject(const String& key);
 
     void clearWindowShell();
 
     Dart_Handle callFunction(Dart_Handle function, int argc, Dart_Handle* argv);
 
     void startDart();
 
     Frame* frame() const { return m_frame; }
     void collectScriptStates(ScriptState* v8ScriptState, Vector<ScriptState*>& result);
     void collectScriptStatesForIsolate(Dart_Isolate, v8::Handle<v8::Context> v8Context, Vector<ScriptState*>& result);
+    DartScriptState* lookupScriptState(Dart_Isolate, v8::Handle<v8::Context> v8Context, intptr_t libraryId);
 
     static DartController* retrieve(Frame*);
     static DartController* retrieve(ScriptExecutionContext*);
 
     // FIXME: Move.
     void loadAndRunScript(const String&, PassRefPtr<DartAsyncLoader>, PassRefPtr<ScriptElementProxy>);
 private:
     static void initVMIfNeeded();
 
     static Dart_Isolate createIsolate(const char* scriptURL, const char* entryPoint, Document*, bool isDOMEnabled, char** errorMessage);
     static void shutdownIsolate(Dart_Isolate);
 
     void createDOMEnabledIsolateIfNeeded(const String& scriptURL, const String& entryPoint, Document*);
 
     static Dart_Isolate createPureIsolateCallback(const char* prefix, const char* main, void* callbackData, char** errorMsg);
     void installDartExtensions(v8::Handle<v8::Context>);
 
     bool isDartMimeType(const String& mimeType);
     void loadScripts();
     void collectScripts(HashSet<Document*>&, Document*);
     void processScriptInQueue();
 
+    LibraryIdMap* libraryIdMapForIsolate(Dart_Isolate);
+    DartScriptState* lookupScriptStateFromLibraryIdMap(Dart_Isolate, v8::Handle<v8::Context>, LibraryIdMap*, intptr_t libraryId);
+
     // The frame that owns this controller.
     Frame* m_frame;
 
     bool m_scriptsLoaded;
     Deque< RefPtr<Node> > m_scriptsToLoadQueue;
 
     // Isolate associated with scripts in this document.
     Dart_Isolate m_isolate;
     RefPtr<DartApplicationLoader> m_loader;
 
-    typedef HashMap<intptr_t, DartScriptState*> LibraryIdMap;
-    typedef HashMap<Dart_Isolate, LibraryIdMap*> ScriptStatesMap;
     ScriptStatesMap m_scriptStates;
 
     typedef HashMap<String, NPObject*> NPObjectMap;
     NPObjectMap m_npObjectMap;
 
     friend class DartScriptRunner;
     friend class DartDomCallback;
 };
 
 }
 
 #endif // DartController_h