diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/v8/src/libplatform/tracing/tracing-controller.cc | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/v8/src/libplatform/tracing/tracing-controller.cc')
-rw-r--r-- | chromium/v8/src/libplatform/tracing/tracing-controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/v8/src/libplatform/tracing/tracing-controller.cc b/chromium/v8/src/libplatform/tracing/tracing-controller.cc index 2fb610ac72b..0c44e227349 100644 --- a/chromium/v8/src/libplatform/tracing/tracing-controller.cc +++ b/chromium/v8/src/libplatform/tracing/tracing-controller.cc @@ -170,7 +170,7 @@ const uint8_t* TracingController::GetCategoryGroupEnabledInternal( } } - unsigned char* category_group_enabled = NULL; + unsigned char* category_group_enabled = nullptr; size_t category_index = base::Acquire_Load(&g_category_index); for (size_t i = 0; i < category_index; ++i) { if (strcmp(g_category_groups[i], category_group) == 0) { |