summaryrefslogtreecommitdiff
path: root/chromium/gin/public
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/gin/public
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/gin/public')
-rw-r--r--chromium/gin/public/context_holder.h4
-rw-r--r--chromium/gin/public/gin_features.h20
-rw-r--r--chromium/gin/public/isolate_holder.h11
-rw-r--r--chromium/gin/public/v8_platform.h3
4 files changed, 30 insertions, 8 deletions
diff --git a/chromium/gin/public/context_holder.h b/chromium/gin/public/context_holder.h
index 176af1754fe..f0efc9b6473 100644
--- a/chromium/gin/public/context_holder.h
+++ b/chromium/gin/public/context_holder.h
@@ -6,9 +6,9 @@
#define GIN_PUBLIC_CONTEXT_HOLDER_H_
#include <list>
+#include <memory>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "gin/gin_export.h"
#include "v8/include/v8.h"
@@ -42,7 +42,7 @@ class GIN_EXPORT ContextHolder {
private:
v8::Isolate* isolate_;
v8::UniquePersistent<v8::Context> context_;
- scoped_ptr<PerContextData> data_;
+ std::unique_ptr<PerContextData> data_;
DISALLOW_COPY_AND_ASSIGN(ContextHolder);
};
diff --git a/chromium/gin/public/gin_features.h b/chromium/gin/public/gin_features.h
new file mode 100644
index 00000000000..6a6c6b924c9
--- /dev/null
+++ b/chromium/gin/public/gin_features.h
@@ -0,0 +1,20 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file defines all the public base::FeatureList features for the gin
+// module.
+
+#ifndef GIN_PUBLIC_GIN_FEATURES_H_
+#define GIN_PUBLIC_GIN_FEATURES_H_
+
+#include "base/feature_list.h"
+#include "gin/gin_export.h"
+
+namespace features {
+
+GIN_EXPORT extern const base::Feature kV8Ignition;
+
+} // namespace features
+
+#endif // GIN_PUBLIC_GIN_FEATURES_H_
diff --git a/chromium/gin/public/isolate_holder.h b/chromium/gin/public/isolate_holder.h
index cb51c2f0844..7cf3d94ac89 100644
--- a/chromium/gin/public/isolate_holder.h
+++ b/chromium/gin/public/isolate_holder.h
@@ -5,8 +5,9 @@
#ifndef GIN_PUBLIC_ISOLATE_HOLDER_H_
#define GIN_PUBLIC_ISOLATE_HOLDER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "gin/gin_export.h"
#include "gin/public/v8_idle_task_runner.h"
#include "v8/include/v8.h"
@@ -74,7 +75,7 @@ class GIN_EXPORT IsolateHolder {
// This method returns if v8::Locker is needed to access isolate.
AccessMode access_mode() const { return access_mode_; }
- void EnableIdleTasks(scoped_ptr<V8IdleTaskRunner> idle_task_runner);
+ void EnableIdleTasks(std::unique_ptr<V8IdleTaskRunner> idle_task_runner);
// This method returns V8IsolateMemoryDumpProvider of this isolate, used for
// testing.
@@ -85,9 +86,9 @@ class GIN_EXPORT IsolateHolder {
private:
v8::Isolate* isolate_;
- scoped_ptr<PerIsolateData> isolate_data_;
- scoped_ptr<RunMicrotasksObserver> task_observer_;
- scoped_ptr<V8IsolateMemoryDumpProvider> isolate_memory_dump_provider_;
+ std::unique_ptr<PerIsolateData> isolate_data_;
+ std::unique_ptr<RunMicrotasksObserver> task_observer_;
+ std::unique_ptr<V8IsolateMemoryDumpProvider> isolate_memory_dump_provider_;
AccessMode access_mode_;
DISALLOW_COPY_AND_ASSIGN(IsolateHolder);
diff --git a/chromium/gin/public/v8_platform.h b/chromium/gin/public/v8_platform.h
index 31e812e05b7..ad37a5c4ceb 100644
--- a/chromium/gin/public/v8_platform.h
+++ b/chromium/gin/public/v8_platform.h
@@ -8,7 +8,6 @@
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/trace_event/trace_event.h"
#include "gin/gin_export.h"
#include "v8/include/v8-platform.h"
@@ -20,6 +19,7 @@ class GIN_EXPORT V8Platform : public NON_EXPORTED_BASE(v8::Platform) {
static V8Platform* Get();
// v8::Platform implementation.
+ size_t NumberOfAvailableBackgroundThreads() override;
void CallOnBackgroundThread(
v8::Task* task,
v8::Platform::ExpectedRuntime expected_runtime) override;
@@ -37,6 +37,7 @@ class GIN_EXPORT V8Platform : public NON_EXPORTED_BASE(v8::Platform) {
uint64_t AddTraceEvent(char phase,
const uint8_t* category_enabled_flag,
const char* name,
+ const char* scope,
uint64_t id,
uint64_t bind_id,
int32_t num_args,