Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: Source/bindings/dart/DartController.h

Issue 33973002: Fix for https://code.google.com/p/dart/issues/detail?id=5851 Proper line #s and columns for Dart er… (Closed) Base URL: svn://svn.chromium.org/multivm/trunk/webkit
Patch Set: ready to review Created 7 years, 2 months 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
Download patch
Index: Source/bindings/dart/DartController.h
diff --git a/Source/bindings/dart/DartController.h b/Source/bindings/dart/DartController.h
index 724f99fd10b59aaa90ed1bc7c116a591b2053b68..3074ed4c9e4ab1f8c171f095036a2c65ded9a990 100644
--- a/Source/bindings/dart/DartController.h
+++ b/Source/bindings/dart/DartController.h
@@ -53,6 +53,9 @@ 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.
@@ -77,6 +80,7 @@ public:
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*);
@@ -99,6 +103,9 @@ private:
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;
@@ -109,8 +116,6 @@ private:
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;

Powered by Google App Engine
This is Rietveld 408576698