diff --git a/DEPS b/DEPS index 3634010038f5f..33d2cb38b851e 100644 --- a/DEPS +++ b/DEPS @@ -123,7 +123,7 @@ deps = { # and not have to specific specific hashes. 'src/third_party/tonic': - Var('fuchsia_git') + '/tonic' + '@' + '57d508b12462db686573edcbc97891d90cf92f90', + Var('fuchsia_git') + '/tonic' + '@' + '6bab0f304b043d8cf09900334e78b63111f76c5c', 'src/third_party/benchmark': Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index c654902782357..a1449c37fa2a3 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: ec72b49802f64feb7fa74573a404abc5 +Signature: 092d7fdd5c3c7962192e716fb3746099 UNUSED LICENSES: @@ -16752,8 +16752,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: tonic -ORIGIN: ../../../third_party/tonic/common/macros.h + ../../../third_party/tonic/LICENSE +ORIGIN: ../../../third_party/tonic/common/log.cc + ../../../third_party/tonic/LICENSE TYPE: LicenseType.bsd +FILE: ../../../third_party/tonic/common/log.cc +FILE: ../../../third_party/tonic/common/log.h FILE: ../../../third_party/tonic/common/macros.h ---------------------------------------------------------------------------------------------------- Copyright 2018 The Fuchsia Authors. All rights reserved. diff --git a/shell/common/shell.cc b/shell/common/shell.cc index 5017a2c6078fa..5afe07691eca0 100644 --- a/shell/common/shell.cc +++ b/shell/common/shell.cc @@ -28,6 +28,7 @@ #include "flutter/shell/common/vsync_waiter.h" #include "third_party/dart/runtime/include/dart_tools_api.h" #include "third_party/skia/include/core/SkGraphics.h" +#include "third_party/tonic/common/log.h" #ifdef ERROR #undef ERROR @@ -176,6 +177,9 @@ static void PerformInitializationTasks(const blink::Settings& settings) { fml::SetLogSettings(log_settings); } + tonic::SetLogHandler( + [](const char* message) { FML_LOG(ERROR) << message; }); + if (settings.trace_skia) { InitSkiaEventTracer(settings.trace_skia); }