diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-07 13:12:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 10:02:59 +0000 |
commit | 33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (patch) | |
tree | f6af110909c79b2759136554f1143d8b0572af0a /chromium/ppapi | |
parent | 7d2c5d177e9813077a621df8d18c0deda73099b3 (diff) | |
download | qtwebengine-chromium-33fc33aa94d4add0878ec30dc818e34e1dd3cc2a.tar.gz |
BASELINE: Update Chromium to 104.0.5112.120
Change-Id: I5d2726c2ab018d75d055739b6ba64317904f05bb
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438935
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ppapi')
-rw-r--r-- | chromium/ppapi/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/ppapi/PRESUBMIT.py | 4 | ||||
-rw-r--r-- | chromium/ppapi/c/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/ppapi/cpp/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/ppapi/examples/audio/audio.cc | 8 | ||||
-rw-r--r-- | chromium/ppapi/examples/ppapi_example.gni | 7 | ||||
-rw-r--r-- | chromium/ppapi/host/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/ppapi/lib/gl/gles2/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/ppapi/native_client/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/ppapi/proxy/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc | 16 | ||||
-rw-r--r-- | chromium/ppapi/proxy/ppapi_command_buffer_proxy.h | 5 | ||||
-rw-r--r-- | chromium/ppapi/shared_impl/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/ppapi/shared_impl/file_type_conversion.cc | 4 | ||||
-rw-r--r-- | chromium/ppapi/shared_impl/file_type_conversion.h | 2 | ||||
-rw-r--r-- | chromium/ppapi/tests/extensions/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/ppapi/thunk/BUILD.gn | 4 |
17 files changed, 45 insertions, 40 deletions
diff --git a/chromium/ppapi/BUILD.gn b/chromium/ppapi/BUILD.gn index e128f54c165..df51b899288 100644 --- a/chromium/ppapi/BUILD.gn +++ b/chromium/ppapi/BUILD.gn @@ -13,9 +13,7 @@ if (is_mac) { import("//build/config/mac/rules.gni") } -assert( - !(is_android || is_fuchsia) || enable_plugins, - "ppapi should not be used on Android or Fuchsia, unless plugins are explicitly enabled") +assert(enable_plugins) # Test files shared between several targets below. # diff --git a/chromium/ppapi/PRESUBMIT.py b/chromium/ppapi/PRESUBMIT.py index b3a11d6a05b..61e78a77852 100644 --- a/chromium/ppapi/PRESUBMIT.py +++ b/chromium/ppapi/PRESUBMIT.py @@ -86,7 +86,7 @@ def CheckTODO(input_api, output_api): todo.append(filename) if todo: - return [output_api.PresubmitError( + return [output_api.PresubmitPromptWarning( 'TODOs found in stable public PPAPI files:', long_text='\n'.join(todo))] return [] @@ -166,7 +166,7 @@ def CheckUpdatedNaClSDK(input_api, output_api): # TODO(crbug.com/1222512): Use sys.executable instead of # input_api.python_executable once idl_tests.py is py3 compatible, drop # shell=True. - cmd = [input_api.python_executable, verify_ppapi_py + cmd = [input_api.python3_executable, verify_ppapi_py ] + nacl_sdk_files[i:i + files_per_command] results.extend( RunCmdAndCheck( diff --git a/chromium/ppapi/c/BUILD.gn b/chromium/ppapi/c/BUILD.gn index 25d464f284a..2bf9ad70d9f 100644 --- a/chromium/ppapi/c/BUILD.gn +++ b/chromium/ppapi/c/BUILD.gn @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ppapi/buildflags/buildflags.gni") + +assert(enable_plugins) + # These are just headers. source_set("c") { sources = [ diff --git a/chromium/ppapi/cpp/BUILD.gn b/chromium/ppapi/cpp/BUILD.gn index d3b6bb6e1ab..c9de58a298b 100644 --- a/chromium/ppapi/cpp/BUILD.gn +++ b/chromium/ppapi/cpp/BUILD.gn @@ -2,10 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ppapi/buildflags/buildflags.gni") + if (is_nacl) { import("//build/config/nacl/config.gni") } +assert(enable_plugins) + if (is_nacl && is_nacl_glibc) { cpp_target_type = "shared_library" } else { diff --git a/chromium/ppapi/examples/audio/audio.cc b/chromium/ppapi/examples/audio/audio.cc index 07540f1e35d..bc69a05e072 100644 --- a/chromium/ppapi/examples/audio/audio.cc +++ b/chromium/ppapi/examples/audio/audio.cc @@ -78,10 +78,10 @@ class MyInstance : public pp::Instance { } void SineWaveCallback(void* samples, uint32_t num_bytes) { - double delta_l = 2.0 * M_PI * kLeftFrequency / sample_rate_ / - (visible_ ? 1 : 2); - double delta_r = 2.0 * M_PI * kRightFrequency / sample_rate_ / - (visible_ ? 1 : 2); + double delta_l = 2.0 * M_PI * kLeftFrequency / + static_cast<double>(sample_rate_) / (visible_ ? 1 : 2); + double delta_r = 2.0 * M_PI * kRightFrequency / + static_cast<double>(sample_rate_) / (visible_ ? 1 : 2); // Use per channel audio wave value to avoid clicks on buffer boundries. double wave_l = audio_wave_l_; diff --git a/chromium/ppapi/examples/ppapi_example.gni b/chromium/ppapi/examples/ppapi_example.gni index daabe967de3..83531150488 100644 --- a/chromium/ppapi/examples/ppapi_example.gni +++ b/chromium/ppapi/examples/ppapi_example.gni @@ -2,18 +2,19 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ppapi/buildflags/buildflags.gni") + if (is_mac) { import("//build/config/mac/rules.gni") } +assert(enable_plugins) + # Declares a PPAPI example target of the correct type for the current platform # and with the right linker flags. template("ppapi_example") { if (!is_mac) { shared_library(target_name) { - # TODO(crbug.com/1292951): Remove this line. - configs -= [ "//build/config/compiler:prevent_unsafe_narrowing" ] - testonly = true if (defined(invoker.output_name)) { diff --git a/chromium/ppapi/host/BUILD.gn b/chromium/ppapi/host/BUILD.gn index 677654a27d3..405511129cf 100644 --- a/chromium/ppapi/host/BUILD.gn +++ b/chromium/ppapi/host/BUILD.gn @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ppapi/buildflags/buildflags.gni") + +assert(enable_plugins) + component("host") { output_name = "ppapi_host" diff --git a/chromium/ppapi/lib/gl/gles2/BUILD.gn b/chromium/ppapi/lib/gl/gles2/BUILD.gn index 13a993cc01f..27e33f89dfb 100644 --- a/chromium/ppapi/lib/gl/gles2/BUILD.gn +++ b/chromium/ppapi/lib/gl/gles2/BUILD.gn @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ppapi/buildflags/buildflags.gni") + +assert(enable_plugins) + config("gles2_config") { include_dirs = [ "//ppapi/lib/gl/include" ] } diff --git a/chromium/ppapi/native_client/BUILD.gn b/chromium/ppapi/native_client/BUILD.gn index ae3e1760455..4c1aa73ae50 100644 --- a/chromium/ppapi/native_client/BUILD.gn +++ b/chromium/ppapi/native_client/BUILD.gn @@ -4,8 +4,11 @@ import("//build/config/features.gni") import("//build/config/nacl/config.gni") +import("//components/nacl/features.gni") import("//components/nacl/target_cpu.gni") +assert(enable_nacl) + if (is_nacl) { group("ppapi_lib") { deps = [ "//ppapi/native_client/src/untrusted/irt_stub:ppapi_stub_lib" ] diff --git a/chromium/ppapi/proxy/BUILD.gn b/chromium/ppapi/proxy/BUILD.gn index 1510b98eed4..2b72fc14c84 100644 --- a/chromium/ppapi/proxy/BUILD.gn +++ b/chromium/ppapi/proxy/BUILD.gn @@ -3,6 +3,9 @@ # found in the LICENSE file. import("//build/config/nacl/config.gni") +import("//ppapi/buildflags/buildflags.gni") + +assert(enable_plugins) config("proxy_implementation") { defines = [ "PPAPI_PROXY_IMPLEMENTATION" ] diff --git a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc index a76aaab2f9a..27ab29f7735 100644 --- a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc +++ b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.cc @@ -227,11 +227,6 @@ bool PpapiCommandBufferProxy::CanWaitUnverifiedSyncToken( return false; } -void PpapiCommandBufferProxy::SetDisplayTransform( - gfx::OverlayTransform transform) { - NOTREACHED(); -} - void PpapiCommandBufferProxy::SignalQuery(uint32_t query, base::OnceClosure callback) { NOTREACHED(); @@ -257,17 +252,6 @@ const gpu::Capabilities& PpapiCommandBufferProxy::GetCapabilities() const { return capabilities_; } -int32_t PpapiCommandBufferProxy::CreateImage(ClientBuffer buffer, - size_t width, - size_t height) { - NOTREACHED(); - return -1; -} - -void PpapiCommandBufferProxy::DestroyImage(int32_t id) { - NOTREACHED(); -} - bool PpapiCommandBufferProxy::Send(IPC::Message* msg) { DCHECK(last_state_.error == gpu::error::kNoError); diff --git a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h index ee2bcec1d49..f1294ddaa6b 100644 --- a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h +++ b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h @@ -62,10 +62,6 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, // gpu::GpuControl implementation: void SetGpuControlClient(gpu::GpuControlClient*) override; const gpu::Capabilities& GetCapabilities() const override; - int32_t CreateImage(ClientBuffer buffer, - size_t width, - size_t height) override; - void DestroyImage(int32_t id) override; void SignalQuery(uint32_t query, base::OnceClosure callback) override; void CreateGpuFence(uint32_t gpu_fence_id, ClientGpuFence source) override; void GetGpuFence(uint32_t gpu_fence_id, @@ -82,7 +78,6 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, base::OnceClosure callback) override; void WaitSyncToken(const gpu::SyncToken& sync_token) override; bool CanWaitUnverifiedSyncToken(const gpu::SyncToken& sync_token) override; - void SetDisplayTransform(gfx::OverlayTransform transform) override; private: bool Send(IPC::Message* msg); diff --git a/chromium/ppapi/shared_impl/BUILD.gn b/chromium/ppapi/shared_impl/BUILD.gn index 3292f68d307..430ad5b4167 100644 --- a/chromium/ppapi/shared_impl/BUILD.gn +++ b/chromium/ppapi/shared_impl/BUILD.gn @@ -5,9 +5,7 @@ import("//build/config/nacl/config.gni") import("//ppapi/buildflags/buildflags.gni") -assert( - !(is_android || is_fuchsia) || enable_plugins, - "ppapi should not be used on Android or Fuchsia, unless plugins are explicitly enabled") +assert(enable_plugins) # //ppapi/shared_impl and //ppapi/thunk go into the same library. config("export_shared_impl_and_thunk") { @@ -105,7 +103,7 @@ source_set("common") { "//base", "//base:i18n", "//build:chromeos_buildflags", - "//ppapi/c:c", + "//ppapi/c", "//ppapi/thunk:headers", "//third_party/icu:icuuc", "//url", diff --git a/chromium/ppapi/shared_impl/file_type_conversion.cc b/chromium/ppapi/shared_impl/file_type_conversion.cc index 4ca461854ae..b76c10cecaa 100644 --- a/chromium/ppapi/shared_impl/file_type_conversion.cc +++ b/chromium/ppapi/shared_impl/file_type_conversion.cc @@ -36,7 +36,7 @@ int FileErrorToPepperError(base::File::Error error_code) { } bool PepperFileOpenFlagsToPlatformFileFlags(int32_t pp_open_flags, - int* flags_out) { + uint32_t* flags_out) { bool pp_read = !!(pp_open_flags & PP_FILEOPENFLAG_READ); bool pp_write = !!(pp_open_flags & PP_FILEOPENFLAG_WRITE); bool pp_create = !!(pp_open_flags & PP_FILEOPENFLAG_CREATE); @@ -45,7 +45,7 @@ bool PepperFileOpenFlagsToPlatformFileFlags(int32_t pp_open_flags, bool pp_append = !!(pp_open_flags & PP_FILEOPENFLAG_APPEND); // Pepper allows Touch on any open file, so always set this Windows-only flag. - int flags = base::File::FLAG_WRITE_ATTRIBUTES; + uint32_t flags = base::File::FLAG_WRITE_ATTRIBUTES; if (pp_read) flags |= base::File::FLAG_READ; diff --git a/chromium/ppapi/shared_impl/file_type_conversion.h b/chromium/ppapi/shared_impl/file_type_conversion.h index d49831a9821..a628f493b30 100644 --- a/chromium/ppapi/shared_impl/file_type_conversion.h +++ b/chromium/ppapi/shared_impl/file_type_conversion.h @@ -20,7 +20,7 @@ PPAPI_SHARED_EXPORT int FileErrorToPepperError(base::File::Error error_code); // Returns |true| if okay. PPAPI_SHARED_EXPORT bool PepperFileOpenFlagsToPlatformFileFlags( int32_t pp_open_flags, - int* flags_out); + uint32_t* flags_out); PPAPI_SHARED_EXPORT void FileInfoToPepperFileInfo(const base::File::Info& info, PP_FileSystemType fs_type, diff --git a/chromium/ppapi/tests/extensions/BUILD.gn b/chromium/ppapi/tests/extensions/BUILD.gn index ee052e2fcb9..05c5f997045 100644 --- a/chromium/ppapi/tests/extensions/BUILD.gn +++ b/chromium/ppapi/tests/extensions/BUILD.gn @@ -4,8 +4,11 @@ import("//components/nacl/features.gni") import("//components/nacl/target_cpu.gni") +import("//ppapi/buildflags/buildflags.gni") import("//ppapi/native_client/nacl_test_data.gni") +assert(enable_plugins) + group("extensions") { newlib = "//build/toolchain/nacl:clang_newlib_${nacl_target_cpu}" pnacl = "//build/toolchain/nacl:newlib_pnacl" diff --git a/chromium/ppapi/thunk/BUILD.gn b/chromium/ppapi/thunk/BUILD.gn index cd481ad7d0a..9a1139ec584 100644 --- a/chromium/ppapi/thunk/BUILD.gn +++ b/chromium/ppapi/thunk/BUILD.gn @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ppapi/buildflags/buildflags.gni") + +assert(enable_plugins) + source_set("headers") { visibility = [ ":thunk", |