summaryrefslogtreecommitdiff
path: root/chromium/gin/public
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-01-29 16:35:13 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-01 15:33:35 +0000
commitc8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch)
tree9157c3d9815e5870799e070b113813bec53e0535 /chromium/gin/public
parentabefd5095b41dac94ca451d784ab6e27372e981a (diff)
downloadqtwebengine-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/gin/public')
-rw-r--r--chromium/gin/public/isolate_holder.h10
-rw-r--r--chromium/gin/public/v8_platform.h4
2 files changed, 10 insertions, 4 deletions
diff --git a/chromium/gin/public/isolate_holder.h b/chromium/gin/public/isolate_holder.h
index e2adf65d785..f29b2dea766 100644
--- a/chromium/gin/public/isolate_holder.h
+++ b/chromium/gin/public/isolate_holder.h
@@ -60,13 +60,11 @@ class GIN_EXPORT IsolateHolder {
IsolateHolder(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
AccessMode access_mode,
AllowAtomicsWaitMode atomics_wait_mode,
- const intptr_t* reference_table,
v8::StartupData* startup_data);
// This constructor is to create V8 snapshot for Blink.
// Note this constructor calls isolate->Enter() internally.
- IsolateHolder(const intptr_t* reference_table,
- v8::StartupData* existing_blob);
+ explicit IsolateHolder(v8::StartupData* existing_blob);
~IsolateHolder();
@@ -78,9 +76,13 @@ class GIN_EXPORT IsolateHolder {
// snapshot file is available, it should also be loaded (by calling
// V8Initializer::LoadV8SnapshotFromFD or
// V8Initializer::LoadV8Snapshot) before calling this method.
+ // If the snapshot file contains customised contexts which have static
+ // external references, |reference_table| needs to point an array of those
+ // reference pointers. Otherwise, it can be nullptr.
static void Initialize(ScriptMode mode,
V8ExtrasMode v8_extras_mode,
- v8::ArrayBuffer::Allocator* allocator);
+ v8::ArrayBuffer::Allocator* allocator,
+ const intptr_t* reference_table = nullptr);
v8::Isolate* isolate() { return isolate_; }
diff --git a/chromium/gin/public/v8_platform.h b/chromium/gin/public/v8_platform.h
index b25582c1147..cbbebc0760f 100644
--- a/chromium/gin/public/v8_platform.h
+++ b/chromium/gin/public/v8_platform.h
@@ -20,6 +20,10 @@ class GIN_EXPORT V8Platform : public v8::Platform {
// v8::Platform implementation.
void OnCriticalMemoryPressure() override;
+ std::shared_ptr<v8::TaskRunner> GetForegroundTaskRunner(
+ v8::Isolate*) override;
+ std::shared_ptr<v8::TaskRunner> GetBackgroundTaskRunner(
+ v8::Isolate*) override;
size_t NumberOfAvailableBackgroundThreads() override;
void CallOnBackgroundThread(
v8::Task* task,