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 | |
| 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')
5 files changed, 7 insertions, 7 deletions
diff --git a/chromium/v8/src/libplatform/tracing/trace-buffer.cc b/chromium/v8/src/libplatform/tracing/trace-buffer.cc index 354f0459f68..c7142ea520d 100644 --- a/chromium/v8/src/libplatform/tracing/trace-buffer.cc +++ b/chromium/v8/src/libplatform/tracing/trace-buffer.cc @@ -41,9 +41,9 @@ TraceObject* TraceBufferRingBuffer::GetEventByHandle(uint64_t handle) { size_t chunk_index, event_index; uint32_t chunk_seq; ExtractHandle(handle, &chunk_index, &chunk_seq, &event_index); - if (chunk_index >= chunks_.size()) return NULL; + if (chunk_index >= chunks_.size()) return nullptr; auto& chunk = chunks_[chunk_index]; - if (!chunk || chunk->seq() != chunk_seq) return NULL; + if (!chunk || chunk->seq() != chunk_seq) return nullptr; return chunk->GetEventAt(event_index); } diff --git a/chromium/v8/src/libplatform/tracing/trace-config.cc b/chromium/v8/src/libplatform/tracing/trace-config.cc index ff90eff71c1..04ac3f03e73 100644 --- a/chromium/v8/src/libplatform/tracing/trace-config.cc +++ b/chromium/v8/src/libplatform/tracing/trace-config.cc @@ -33,7 +33,7 @@ bool TraceConfig::IsCategoryGroupEnabled(const char* category_group) const { } void TraceConfig::AddIncludedCategory(const char* included_category) { - DCHECK(included_category != NULL && strlen(included_category) > 0); + DCHECK(included_category != nullptr && strlen(included_category) > 0); included_categories_.push_back(included_category); } diff --git a/chromium/v8/src/libplatform/tracing/trace-object.cc b/chromium/v8/src/libplatform/tracing/trace-object.cc index bb4bf713907..6d1a6d62b5d 100644 --- a/chromium/v8/src/libplatform/tracing/trace-object.cc +++ b/chromium/v8/src/libplatform/tracing/trace-object.cc @@ -13,8 +13,8 @@ namespace v8 { namespace platform { namespace tracing { -// We perform checks for NULL strings since it is possible that a string arg -// value is NULL. +// We perform checks for nullptr strings since it is possible that a string arg +// value is nullptr. V8_INLINE static size_t GetAllocLength(const char* str) { return str ? strlen(str) + 1 : 0; } diff --git a/chromium/v8/src/libplatform/tracing/trace-writer.cc b/chromium/v8/src/libplatform/tracing/trace-writer.cc index 7445087c565..36a8783499d 100644 --- a/chromium/v8/src/libplatform/tracing/trace-writer.cc +++ b/chromium/v8/src/libplatform/tracing/trace-writer.cc @@ -102,7 +102,7 @@ void JSONTraceWriter::AppendArgValue(uint8_t type, case TRACE_VALUE_TYPE_STRING: case TRACE_VALUE_TYPE_COPY_STRING: if (value.as_string == nullptr) { - stream_ << "\"NULL\""; + stream_ << "\"nullptr\""; } else { WriteJSONStringToStream(value.as_string, stream_); } 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) { |