From 9c0c62016da07a74bf2e256107b281d7358fb9d9 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 15 Aug 2018 14:28:24 -0700 Subject: [PATCH] Re-apply "Log Tonic errors with FML_LOG" (#6026) This reverts commit d03897011aa6a88d2c95c0b7f3f47291db8eb2da and updates the tonic SHA. --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 6 ++++-- shell/common/shell.cc | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index ba56192a843..2437d2068ce 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 c6549027823..a1449c37fa2 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 5017a2c6078..5afe07691ec 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); }