diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-12 09:13:00 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 09:58:26 +0000 |
commit | 03561cae90f1d99b5c54b1ef3be69f10e882b25e (patch) | |
tree | cc5f0958e823c044e7ae51cc0117fe51432abe5e /chromium/gin | |
parent | fa98118a45f7e169f8846086dc2c22c49a8ba310 (diff) | |
download | qtwebengine-chromium-03561cae90f1d99b5c54b1ef3be69f10e882b25e.tar.gz |
BASELINE: Update Chromium to 88.0.4324.208
Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/gin')
-rw-r--r-- | chromium/gin/DIR_METADATA | 12 | ||||
-rw-r--r-- | chromium/gin/OWNERS | 3 | ||||
-rw-r--r-- | chromium/gin/v8_foreground_task_runner.cc | 2 | ||||
-rw-r--r-- | chromium/gin/v8_foreground_task_runner_with_locker.cc | 2 | ||||
-rw-r--r-- | chromium/gin/v8_platform.cc | 26 |
5 files changed, 38 insertions, 7 deletions
diff --git a/chromium/gin/DIR_METADATA b/chromium/gin/DIR_METADATA new file mode 100644 index 00000000000..a50f14ccf66 --- /dev/null +++ b/chromium/gin/DIR_METADATA @@ -0,0 +1,12 @@ +# Metadata information for this directory. +# +# For more information on DIR_METADATA files, see: +# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md +# +# For the schema of this file, see Metadata message: +# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto + +monorail { + component: "Blink>Bindings" +} +team_email: "blink-reviews-bindings@chromium.org"
\ No newline at end of file diff --git a/chromium/gin/OWNERS b/chromium/gin/OWNERS index 481dea8981a..3ac44eb8e9f 100644 --- a/chromium/gin/OWNERS +++ b/chromium/gin/OWNERS @@ -1,6 +1,3 @@ jochen@chromium.org jbroman@chromium.org rmcilroy@chromium.org - -# TEAM: blink-reviews-bindings@chromium.org -# COMPONENT: Blink>Bindings diff --git a/chromium/gin/v8_foreground_task_runner.cc b/chromium/gin/v8_foreground_task_runner.cc index f6d916cd05e..f0b1209babe 100644 --- a/chromium/gin/v8_foreground_task_runner.cc +++ b/chromium/gin/v8_foreground_task_runner.cc @@ -5,7 +5,7 @@ #include "gin/v8_foreground_task_runner.h" #include "base/bind.h" -#include "base/bind_helpers.h" +#include "base/callback_helpers.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chromium/gin/v8_foreground_task_runner_with_locker.cc b/chromium/gin/v8_foreground_task_runner_with_locker.cc index 73425e218b9..949ed0d15d3 100644 --- a/chromium/gin/v8_foreground_task_runner_with_locker.cc +++ b/chromium/gin/v8_foreground_task_runner_with_locker.cc @@ -5,7 +5,7 @@ #include "gin/v8_foreground_task_runner_with_locker.h" #include "base/bind.h" -#include "base/bind_helpers.h" +#include "base/callback_helpers.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "v8/include/v8.h" diff --git a/chromium/gin/v8_platform.cc b/chromium/gin/v8_platform.cc index 319dca5afc2..68415704fd7 100644 --- a/chromium/gin/v8_platform.cc +++ b/chromium/gin/v8_platform.cc @@ -217,10 +217,16 @@ class PageAllocator : public v8::PageAllocator { size_t length, size_t alignment, v8::PageAllocator::Permission permissions) override { + if (permissions == v8::PageAllocator::Permission::kNoAccessWillJitLater) { + // We could use this information to conditionally set the MAP_JIT flag + // on Mac-arm64; however this permissions value is intended to be a + // short-term solution, so we continue to set MAP_JIT for all V8 pages + // for now. + permissions = v8::PageAllocator::Permission::kNoAccess; + } base::PageAccessibilityConfiguration config = GetPageConfig(permissions); - bool commit = (permissions != v8::PageAllocator::Permission::kNoAccess); return base::AllocPages(address, length, alignment, config, - base::PageTag::kV8, commit); + base::PageTag::kV8); } bool FreePages(void* address, size_t length) override { @@ -303,12 +309,28 @@ class JobHandleImpl : public v8::JobHandle { void NotifyConcurrencyIncrease() override { handle_.NotifyConcurrencyIncrease(); } + bool UpdatePriorityEnabled() const override { return true; } + void UpdatePriority(v8::TaskPriority new_priority) override { + handle_.UpdatePriority(ToBaseTaskPriority(new_priority)); + } void Join() override { handle_.Join(); } void Cancel() override { handle_.Cancel(); } + void CancelAndDetach() override { handle_.CancelAndDetach(); } bool IsCompleted() override { return handle_.IsCompleted(); } bool IsRunning() override { return !!handle_; } private: + static base::TaskPriority ToBaseTaskPriority(v8::TaskPriority priority) { + switch (priority) { + case v8::TaskPriority::kBestEffort: + return base::TaskPriority::BEST_EFFORT; + case v8::TaskPriority::kUserVisible: + return base::TaskPriority::USER_VISIBLE; + case v8::TaskPriority::kUserBlocking: + return base::TaskPriority::USER_BLOCKING; + } + } + base::JobHandle handle_; std::unique_ptr<v8::JobTask> job_task_; }; |