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

Side by Side Diff: Source/bindings/core/dart/DartController.h

Issue 1667603002: Fix compile errors from merge of all dartium changes over the past 4 months. (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/2454_1
Patch Set: Created 4 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011, Google Inc. 1 // Copyright 2011, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 "Please download the latest version at https://www.dartlang.org/tools/da rtium"; 97 "Please download the latest version at https://www.dartlang.org/tools/da rtium";
98 98
99 static void initVMIfNeeded(bool checked, Document*); 99 static void initVMIfNeeded(bool checked, Document*);
100 100
101 void shutdownIsolate(Dart_Isolate); 101 void shutdownIsolate(Dart_Isolate);
102 102
103 Dart_Isolate createDOMEnabledIsolate(const String& scriptURL, const String& entryPoint, const char* packageRoot, Document*); 103 Dart_Isolate createDOMEnabledIsolate(const String& scriptURL, const String& entryPoint, const char* packageRoot, Document*);
104 void scheduleScriptExecution(const String&, Dart_Isolate, PassRefPtr<DartScr iptInfo>); 104 void scheduleScriptExecution(const String&, Dart_Isolate, PassRefPtr<DartScr iptInfo>);
105 void loadAndRunScript(const String&, Dart_Isolate, PassRefPtr<DartScriptInfo >); 105 void loadAndRunScript(const String&, Dart_Isolate, PassRefPtr<DartScriptInfo >);
106 static void shutdownIsolateCallback(void* data); 106 static void shutdownIsolateCallback(void* data);
107 static Dart_Isolate createPureIsolateCallback(const char* prefix, const char * main, const char* packageRoot, const char** packageMap, Dart_IsolateFlags*, vo id* callbackData, char** errorMsg); 107 static Dart_Isolate createPureIsolateCallback(const char* scriptURL, const c har* entryPoint, const char* packageRoot, const char* packageConfig, Dart_Isolat eFlags*, void* data, char** errorMsg);
108 108
109 static void weakCallback(void* isolateCallbackData, Dart_WeakPersistentHandl e, void* peer); 109 static void weakCallback(void* isolateCallbackData, Dart_WeakPersistentHandl e, void* peer);
110 110
111 LibraryIdMap* libraryIdMapForIsolate(Dart_Isolate); 111 LibraryIdMap* libraryIdMapForIsolate(Dart_Isolate);
112 DartScriptState* lookupScriptStateFromLibraryIdMap(Dart_Isolate, v8::Handle< v8::Context>, LibraryIdMap*, intptr_t libraryId); 112 DartScriptState* lookupScriptStateFromLibraryIdMap(Dart_Isolate, v8::Handle< v8::Context>, LibraryIdMap*, intptr_t libraryId);
113 113
114 String isolateName(Dart_Isolate); 114 String isolateName(Dart_Isolate);
115 // The frame that owns this controller. 115 // The frame that owns this controller.
116 LocalFrame* m_frame; 116 LocalFrame* m_frame;
117 117
(...skipping 12 matching lines...) Expand all
130 NPObjectMap m_npObjectMap; 130 NPObjectMap m_npObjectMap;
131 131
132 friend class DartDomLoadCallback; 132 friend class DartDomLoadCallback;
133 friend class DartScriptRunner; 133 friend class DartScriptRunner;
134 friend class DartService; 134 friend class DartService;
135 }; 135 };
136 136
137 } 137 }
138 138
139 #endif // DartController_h 139 #endif // DartController_h
OLDNEW
« no previous file with comments | « Source/bindings/core/dart/DartApplicationLoader.cpp ('k') | Source/bindings/core/dart/DartController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698