Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ deps = {
# and not have to specific specific hashes.

'src/third_party/tonic':
Var('fuchsia_git') + '/tonic' + '@' + '5c9c2b63091ffd6000d44a3b5ff86e4f349e6978',
Var('fuchsia_git') + '/tonic' + '@' + '4634b29a24ccfc0fcfafcc8196ef30131185ad88',

'src/third_party/benchmark':
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '21f1eb3fe269ea43eba862bf6b699cde46587ade',
Expand Down
4 changes: 1 addition & 3 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 79fce3f902a2d69ac126c0f94940eb0b
Signature: 4cafa002301d7d7ff1128bd3f37e6406

UNUSED LICENSES:

Expand Down Expand Up @@ -17564,8 +17564,6 @@ FILE: ../../../third_party/tonic/dart_message_handler.cc
FILE: ../../../third_party/tonic/dart_message_handler.h
FILE: ../../../third_party/tonic/dart_microtask_queue.cc
FILE: ../../../third_party/tonic/dart_microtask_queue.h
FILE: ../../../third_party/tonic/dart_sticky_error.cc
FILE: ../../../third_party/tonic/dart_sticky_error.h
FILE: ../../../third_party/tonic/file_loader/file_loader.cc
FILE: ../../../third_party/tonic/file_loader/file_loader.h
FILE: ../../../third_party/tonic/filesystem/filesystem/eintr_wrapper.h
Expand Down
15 changes: 1 addition & 14 deletions runtime/dart_isolate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "third_party/tonic/dart_class_provider.h"
#include "third_party/tonic/dart_message_handler.h"
#include "third_party/tonic/dart_state.h"
#include "third_party/tonic/dart_sticky_error.h"
#include "third_party/tonic/file_loader/file_loader.h"
#include "third_party/tonic/scopes/dart_api_scope.h"
#include "third_party/tonic/scopes/dart_isolate_scope.h"
Expand Down Expand Up @@ -700,19 +699,7 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(

// |Dart_IsolateShutdownCallback|
void DartIsolate::DartIsolateShutdownCallback(
std::shared_ptr<DartIsolate>* embedder_isolate) {
if (!tonic::DartStickyError::IsSet()) {
return;
}

tonic::DartApiScope api_scope;
Dart_Handle sticky_error = Dart_GetStickyError();
if (!Dart_IsFatalError(sticky_error)) {
FML_LOG(ERROR) << "Isolate " << tonic::StdStringFromDart(Dart_DebugName())
<< " exited with an error";
FML_CHECK(tonic::LogIfError(sticky_error));
}
}
std::shared_ptr<DartIsolate>* embedder_isolate) {}

// |Dart_IsolateCleanupCallback|
void DartIsolate::DartIsolateCleanupCallback(
Expand Down
1 change: 0 additions & 1 deletion runtime/dart_vm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "third_party/tonic/converter/dart_converter.h"
#include "third_party/tonic/dart_class_library.h"
#include "third_party/tonic/dart_class_provider.h"
#include "third_party/tonic/dart_sticky_error.h"
#include "third_party/tonic/file_loader/file_loader.h"
#include "third_party/tonic/logging/dart_error.h"
#include "third_party/tonic/scopes/dart_api_scope.h"
Expand Down