Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

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

Merged
chinmaygarde merged 2 commits into from
Aug 15, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5925fee
Re-apply "Log Tonic errors with FML_LOG"
chinmaygarde Aug 15, 2018
e97706a
Licenses
chinmaygarde Aug 15, 2018
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 4 additions & 2 deletions ci/licenses_golden/licenses_third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: ec72b49802f64feb7fa74573a404abc5
Signature: 092d7fdd5c3c7962192e716fb3746099

UNUSED LICENSES:

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions shell/common/shell.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down