DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-apply "Log Tonic errors with FML_LOG" (#6026)

Browse Source 
This reverts commit d03897011aa6a88d2c95c0b7f3f47291db8eb2da and updates the tonic SHA.
This commit is contained in:
Chinmay Garde 2018-08-15 14:28:24 -07:00 committed by GitHub
parent c09116aeda
commit 9c0c62016d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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',

6
ci/licenses_golden/licenses_third_party
View File

@ -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.

4
shell/common/shell.cc
View File

@ -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);
}