diff options
Diffstat (limited to 'deps/v8/src/libplatform')
11 files changed, 31 insertions, 17 deletions
diff --git a/deps/v8/src/libplatform/default-foreground-task-runner.cc b/deps/v8/src/libplatform/default-foreground-task-runner.cc index 0a31024d9a..2394204348 100644 --- a/deps/v8/src/libplatform/default-foreground-task-runner.cc +++ b/deps/v8/src/libplatform/default-foreground-task-runner.cc @@ -60,6 +60,16 @@ bool DefaultForegroundTaskRunner::IdleTasksEnabled() { return idle_task_support_ == IdleTaskSupport::kEnabled; } +void DefaultForegroundTaskRunner::PostNonNestableTask( + std::unique_ptr<Task> task) { + // Default platform does not nest tasks. + PostTask(std::move(task)); +} + +bool DefaultForegroundTaskRunner::NonNestableTasksEnabled() const { + return true; +} + std::unique_ptr<Task> DefaultForegroundTaskRunner::PopTaskFromQueue( MessageLoopBehavior wait_for_work) { base::MutexGuard guard(&lock_); diff --git a/deps/v8/src/libplatform/default-foreground-task-runner.h b/deps/v8/src/libplatform/default-foreground-task-runner.h index 78c0f6b660..9ff30e3940 100644 --- a/deps/v8/src/libplatform/default-foreground-task-runner.h +++ b/deps/v8/src/libplatform/default-foreground-task-runner.h @@ -5,6 +5,7 @@ #ifndef V8_LIBPLATFORM_DEFAULT_FOREGROUND_TASK_RUNNER_H_ #define V8_LIBPLATFORM_DEFAULT_FOREGROUND_TASK_RUNNER_H_ +#include <memory> #include <queue> #include "include/libplatform/libplatform.h" @@ -35,14 +36,15 @@ class V8_PLATFORM_EXPORT DefaultForegroundTaskRunner // v8::TaskRunner implementation. void PostTask(std::unique_ptr<Task> task) override; - void PostDelayedTask(std::unique_ptr<Task> task, double delay_in_seconds) override; void PostIdleTask(std::unique_ptr<IdleTask> task) override; - bool IdleTasksEnabled() override; + void PostNonNestableTask(std::unique_ptr<Task> task) override; + bool NonNestableTasksEnabled() const override; + private: // The same as PostTask, but the lock is already held by the caller. The // {guard} parameter should make sure that the caller is holding the lock. diff --git a/deps/v8/src/libplatform/default-worker-threads-task-runner.cc b/deps/v8/src/libplatform/default-worker-threads-task-runner.cc index 213e98801a..8cae955fd1 100644 --- a/deps/v8/src/libplatform/default-worker-threads-task-runner.cc +++ b/deps/v8/src/libplatform/default-worker-threads-task-runner.cc @@ -15,7 +15,7 @@ DefaultWorkerThreadsTaskRunner::DefaultWorkerThreadsTaskRunner( time_function_(time_function), thread_pool_size_(thread_pool_size) { for (uint32_t i = 0; i < thread_pool_size; ++i) { - thread_pool_.push_back(base::make_unique<WorkerThread>(this)); + thread_pool_.push_back(std::make_unique<WorkerThread>(this)); } } diff --git a/deps/v8/src/libplatform/default-worker-threads-task-runner.h b/deps/v8/src/libplatform/default-worker-threads-task-runner.h index 31b6c0e817..d761a36e1b 100644 --- a/deps/v8/src/libplatform/default-worker-threads-task-runner.h +++ b/deps/v8/src/libplatform/default-worker-threads-task-runner.h @@ -5,6 +5,7 @@ #ifndef V8_LIBPLATFORM_DEFAULT_WORKER_THREADS_TASK_RUNNER_H_ #define V8_LIBPLATFORM_DEFAULT_WORKER_THREADS_TASK_RUNNER_H_ +#include <memory> #include <vector> #include "include/libplatform/libplatform-export.h" diff --git a/deps/v8/src/libplatform/delayed-task-queue.h b/deps/v8/src/libplatform/delayed-task-queue.h index 675e9ecb8a..9fec948b86 100644 --- a/deps/v8/src/libplatform/delayed-task-queue.h +++ b/deps/v8/src/libplatform/delayed-task-queue.h @@ -6,6 +6,7 @@ #define V8_LIBPLATFORM_DELAYED_TASK_QUEUE_H_ #include <map> +#include <memory> #include <queue> #include "include/libplatform/libplatform-export.h" diff --git a/deps/v8/src/libplatform/task-queue.h b/deps/v8/src/libplatform/task-queue.h index f8c76498f2..fbad3a8adf 100644 --- a/deps/v8/src/libplatform/task-queue.h +++ b/deps/v8/src/libplatform/task-queue.h @@ -5,6 +5,7 @@ #ifndef V8_LIBPLATFORM_TASK_QUEUE_H_ #define V8_LIBPLATFORM_TASK_QUEUE_H_ +#include <memory> #include <queue> #include "include/libplatform/libplatform-export.h" diff --git a/deps/v8/src/libplatform/tracing/DEPS b/deps/v8/src/libplatform/tracing/DEPS index 582200e094..7a45bba55a 100644 --- a/deps/v8/src/libplatform/tracing/DEPS +++ b/deps/v8/src/libplatform/tracing/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+perfetto", - "+third_party/perfetto/include/perfetto/base", -]
\ No newline at end of file + "+protos/perfetto", +] diff --git a/deps/v8/src/libplatform/tracing/json-trace-event-listener.cc b/deps/v8/src/libplatform/tracing/json-trace-event-listener.cc index 94b74ef255..60cc9a98a8 100644 --- a/deps/v8/src/libplatform/tracing/json-trace-event-listener.cc +++ b/deps/v8/src/libplatform/tracing/json-trace-event-listener.cc @@ -7,9 +7,9 @@ #include <cmath> #include "base/trace_event/common/trace_event_common.h" -#include "perfetto/trace/chrome/chrome_trace_packet.pb.h" -#include "perfetto/trace/trace.pb.h" #include "perfetto/tracing.h" +#include "protos/perfetto/trace/chrome/chrome_trace_packet.pb.h" +#include "protos/perfetto/trace/trace.pb.h" #include "src/base/logging.h" #include "src/base/macros.h" diff --git a/deps/v8/src/libplatform/tracing/trace-event-listener.cc b/deps/v8/src/libplatform/tracing/trace-event-listener.cc index 8224221228..2910d8fab2 100644 --- a/deps/v8/src/libplatform/tracing/trace-event-listener.cc +++ b/deps/v8/src/libplatform/tracing/trace-event-listener.cc @@ -4,7 +4,7 @@ #include "src/libplatform/tracing/trace-event-listener.h" -#include "perfetto/trace/trace.pb.h" +#include "protos/perfetto/trace/trace.pb.h" #include "src/base/logging.h" namespace v8 { diff --git a/deps/v8/src/libplatform/tracing/trace-object.cc b/deps/v8/src/libplatform/tracing/trace-object.cc index 6b6e0cf404..d16104df68 100644 --- a/deps/v8/src/libplatform/tracing/trace-object.cc +++ b/deps/v8/src/libplatform/tracing/trace-object.cc @@ -23,12 +23,11 @@ V8_INLINE static size_t GetAllocLength(const char* str) { // location, and then advances |*buffer| by the amount written. V8_INLINE static void CopyTraceObjectParameter(char** buffer, const char** member) { - if (*member) { - size_t length = strlen(*member) + 1; - strncpy(*buffer, *member, length); - *member = *buffer; - *buffer += length; - } + if (*member == nullptr) return; + size_t length = strlen(*member) + 1; + memcpy(*buffer, *member, length); + *member = *buffer; + *buffer += length; } void TraceObject::Initialize( diff --git a/deps/v8/src/libplatform/tracing/tracing-controller.cc b/deps/v8/src/libplatform/tracing/tracing-controller.cc index 3fb34366c2..d0972f9322 100644 --- a/deps/v8/src/libplatform/tracing/tracing-controller.cc +++ b/deps/v8/src/libplatform/tracing/tracing-controller.cc @@ -14,9 +14,9 @@ #ifdef V8_USE_PERFETTO #include "base/trace_event/common/trace_event_common.h" -#include "perfetto/trace/chrome/chrome_trace_event.pbzero.h" -#include "perfetto/trace/trace_packet.pbzero.h" #include "perfetto/tracing.h" +#include "protos/perfetto/trace/chrome/chrome_trace_event.pbzero.h" +#include "protos/perfetto/trace/trace_packet.pbzero.h" #include "src/base/platform/platform.h" #include "src/base/platform/semaphore.h" #include "src/libplatform/tracing/json-trace-event-listener.h" @@ -280,7 +280,7 @@ void TracingController::StartTracing(TraceConfig* trace_config) { #ifdef V8_USE_PERFETTO DCHECK_NOT_NULL(output_stream_); DCHECK(output_stream_->good()); - json_listener_ = base::make_unique<JSONTraceEventListener>(output_stream_); + json_listener_ = std::make_unique<JSONTraceEventListener>(output_stream_); // TODO(petermarshall): Set other the params for the config. ::perfetto::TraceConfig perfetto_trace_config; |