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

Side by Side Diff: runtime/bin/isolate_data.h

Issue 2837873005: Fix some assertion failures on Fuchsia (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « runtime/bin/gen_snapshot.cc ('k') | runtime/bin/loader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #ifndef RUNTIME_BIN_ISOLATE_DATA_H_ 5 #ifndef RUNTIME_BIN_ISOLATE_DATA_H_
6 #define RUNTIME_BIN_ISOLATE_DATA_H_ 6 #define RUNTIME_BIN_ISOLATE_DATA_H_
7 7
8 #include "include/dart_api.h" 8 #include "include/dart_api.h"
9 #include "platform/assert.h" 9 #include "platform/assert.h"
10 #include "platform/globals.h" 10 #include "platform/globals.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 packages_file = strdup(packages_file_); 61 packages_file = strdup(packages_file_);
62 } 62 }
63 63
64 // While loading a loader is associated with the isolate. 64 // While loading a loader is associated with the isolate.
65 bool HasLoader() const { return loader_ != NULL; } 65 bool HasLoader() const { return loader_ != NULL; }
66 Loader* loader() const { 66 Loader* loader() const {
67 ASSERT(loader_ != NULL); 67 ASSERT(loader_ != NULL);
68 return loader_; 68 return loader_;
69 } 69 }
70 void set_loader(Loader* loader) { 70 void set_loader(Loader* loader) {
71 #ifndef TARGET_OS_FUCHSIA
zra 2017/04/26 15:52:20 #if !defined(TARGET_OS_FUCHSIA)
72 // TODO(29458): Enable on Fuchsia.
71 ASSERT((loader_ == NULL) || (loader == NULL)); 73 ASSERT((loader_ == NULL) || (loader == NULL));
74 #endif
72 loader_ = loader; 75 loader_ = loader;
73 } 76 }
74 MallocGrowableArray<char*>* dependencies() const { return dependencies_; } 77 MallocGrowableArray<char*>* dependencies() const { return dependencies_; }
75 void set_dependencies(MallocGrowableArray<char*>* deps) { 78 void set_dependencies(MallocGrowableArray<char*>* deps) {
76 dependencies_ = deps; 79 dependencies_ = deps;
77 } 80 }
78 81
79 void OnIsolateShutdown(); 82 void OnIsolateShutdown();
80 83
81 private: 84 private:
82 Dart_Handle builtin_lib_; 85 Dart_Handle builtin_lib_;
83 Loader* loader_; 86 Loader* loader_;
84 AppSnapshot* app_snapshot_; 87 AppSnapshot* app_snapshot_;
85 MallocGrowableArray<char*>* dependencies_; 88 MallocGrowableArray<char*>* dependencies_;
86 89
87 DISALLOW_COPY_AND_ASSIGN(IsolateData); 90 DISALLOW_COPY_AND_ASSIGN(IsolateData);
88 }; 91 };
89 92
90 } // namespace bin 93 } // namespace bin
91 } // namespace dart 94 } // namespace dart
92 95
93 #endif // RUNTIME_BIN_ISOLATE_DATA_H_ 96 #endif // RUNTIME_BIN_ISOLATE_DATA_H_
OLDNEW
« no previous file with comments | « runtime/bin/gen_snapshot.cc ('k') | runtime/bin/loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698