Remove IS_MINIMAL_TOOLCHAIN This was only set in (some) nacl builds, it's always false now. Bug: 423859723 Change-Id: Ic7e13a939f23c6f50c1ce27221056aeb325538c7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6678414 Auto-Submit: Nico Weber <thakis@chromium.org> Commit-Queue: Derek Schuff <dschuff@chromium.org> Reviewed-by: Derek Schuff <dschuff@chromium.org> Owners-Override: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/main@{#1479393} NOKEYCHECK=True GitOrigin-RevId: 755e965d7c5fab4767934c37bcd524b0cc07adc1
diff --git a/proxy/BUILD.gn b/proxy/BUILD.gn index f83a896..194cdc1 100644 --- a/proxy/BUILD.gn +++ b/proxy/BUILD.gn
@@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/nacl/config.gni") -import("//components/nacl/toolchain.gni") import("//ppapi/buildflags/buildflags.gni") assert(enable_ppapi) @@ -247,7 +246,7 @@ "//ui/gfx/ipc/geometry", ] - if (!is_nacl && !is_minimal_toolchain) { + if (!is_nacl) { deps += [ "//gin", "//skia", @@ -321,7 +320,7 @@ public_deps = [ "//ipc" ] - if (!is_nacl && !is_minimal_toolchain) { + if (!is_nacl) { deps += [ "//skia" ] } }
diff --git a/proxy/ppb_image_data_proxy.cc b/proxy/ppb_image_data_proxy.cc index dc8b89c..d0e138a 100644 --- a/proxy/ppb_image_data_proxy.cc +++ b/proxy/ppb_image_data_proxy.cc
@@ -21,7 +21,6 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "build/build_config.h" -#include "components/nacl/common/buildflags.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_resource.h" @@ -38,7 +37,7 @@ #include "ppapi/thunk/enter.h" #include "ppapi/thunk/thunk.h" -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) #include "skia/ext/platform_canvas.h" //nogncheck #include "ui/surface/transport_dib.h" //nogncheck #endif @@ -377,7 +376,7 @@ // PlatformImageData ----------------------------------------------------------- -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) PlatformImageData::PlatformImageData( const HostResource& resource, const PP_ImageDataDesc& desc, @@ -417,7 +416,7 @@ SkCanvas* PlatformImageData::GetCanvas() { return mapped_canvas_.get(); } -#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#endif // !BUILDFLAG(IS_NACL) // SimpleImageData ------------------------------------------------------------- @@ -496,7 +495,7 @@ break; } case PPB_ImageData_Shared::PLATFORM: { -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) ppapi::proxy::SerializedHandle image_handle; dispatcher->Send(new PpapiHostMsg_PPBImageData_CreatePlatform( kApiID, instance, format, size, init_to_zero, &result, &desc, @@ -524,7 +523,7 @@ bool PPB_ImageData_Proxy::OnMessageReceived(const IPC::Message& msg) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PPB_ImageData_Proxy, msg) -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBImageData_CreatePlatform, OnHostMsgCreatePlatform) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBImageData_CreateSimple, @@ -538,7 +537,7 @@ return handled; } -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) // static PP_Resource PPB_ImageData_Proxy::CreateImageData( PP_Instance instance, @@ -646,7 +645,7 @@ result_image_handle->set_null_shmem_region(); } } -#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#endif // !BUILDFLAG(IS_NACL) void PPB_ImageData_Proxy::OnPluginMsgNotifyUnusedImageData( const HostResource& old_image_data) {
diff --git a/proxy/ppb_image_data_proxy.h b/proxy/ppb_image_data_proxy.h index 7c56082..6a03602 100644 --- a/proxy/ppb_image_data_proxy.h +++ b/proxy/ppb_image_data_proxy.h
@@ -11,7 +11,6 @@ #include "base/memory/unsafe_shared_memory_region.h" #include "build/build_config.h" -#include "components/nacl/common/buildflags.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" @@ -28,9 +27,9 @@ #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_image_data_api.h" -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) #include "third_party/skia/include/core/SkRefCnt.h" //nogncheck -#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#endif class TransportDIB; @@ -84,7 +83,7 @@ // PlatformImageData is a full featured image data resource which can access // the underlying platform-specific canvas and |image_region|. This can't be // used by NaCl apps. -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) class PPAPI_PROXY_EXPORT PlatformImageData : public ImageData { public: PlatformImageData(const ppapi::HostResource& resource, @@ -107,7 +106,7 @@ // Null when the image isn't mapped. std::unique_ptr<SkCanvas> mapped_canvas_; }; -#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#endif // !BUILDFLAG(IS_NACL) // SimpleImageData is a simple, platform-independent image data resource which // can be used by NaCl. It can also be used by trusted apps when access to the
diff --git a/shared_impl/BUILD.gn b/shared_impl/BUILD.gn index 819f5ef..f9fc54e 100644 --- a/shared_impl/BUILD.gn +++ b/shared_impl/BUILD.gn
@@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/nacl/config.gni") -import("//components/nacl/toolchain.gni") import("//ppapi/buildflags/buildflags.gni") assert(enable_ppapi) @@ -104,14 +103,13 @@ "//base", "//base:i18n", "//build:chromeos_buildflags", - "//components/nacl/common:buildflags", "//ppapi/c", "//ppapi/thunk:headers", "//third_party/icu:icuuc", "//url", ] - if (!is_nacl && !is_minimal_toolchain) { + if (!is_nacl) { deps += [ "//skia" ] } } @@ -222,7 +220,6 @@ deps = [ "//build:chromeos_buildflags", - "//components/nacl/common:buildflags", "//device/gamepad/public/cpp:shared_with_blink", "//gpu/command_buffer/client", "//gpu/command_buffer/client:gles2_cmd_helper", @@ -233,7 +230,7 @@ "//ui/gfx:gfx_switches", ] - if (!is_nacl && !is_minimal_toolchain) { + if (!is_nacl) { sources += [ "ppb_video_decoder_shared.cc", "ppb_video_decoder_shared.h",
diff --git a/shared_impl/ppb_image_data_shared.cc b/shared_impl/ppb_image_data_shared.cc index 24c5dc4..ab5e100 100644 --- a/shared_impl/ppb_image_data_shared.cc +++ b/shared_impl/ppb_image_data_shared.cc
@@ -6,9 +6,8 @@ #include "base/notimplemented.h" #include "build/build_config.h" -#include "components/nacl/common/buildflags.h" -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) #include "third_party/skia/include/core/SkTypes.h" //nogncheck #endif @@ -21,9 +20,6 @@ // later. // TODO(dmichael): Really proxy this. return PP_IMAGEDATAFORMAT_BGRA_PREMUL; -#elif BUILDFLAG(IS_MINIMAL_TOOLCHAIN) - NOTIMPLEMENTED(); - return PP_IMAGEDATAFORMAT_BGRA_PREMUL; #else if (SK_B32_SHIFT == 0) return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
diff --git a/shared_impl/private/net_address_private_impl.cc b/shared_impl/private/net_address_private_impl.cc index 35a6653..0b61661 100644 --- a/shared_impl/private/net_address_private_impl.cc +++ b/shared_impl/private/net_address_private_impl.cc
@@ -20,7 +20,6 @@ #include "base/containers/span.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" -#include "components/nacl/common/buildflags.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/shared_impl/proxy_lock.h" @@ -31,8 +30,7 @@ #include <windows.h> #include <winsock2.h> #include <ws2tcpip.h> -#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && \ - !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) #include <arpa/inet.h> #include <netinet/in.h> #include <sys/socket.h> @@ -400,7 +398,7 @@ } // namespace thunk // For the NaCl target, all we need are the API functions and the thunk. -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) // static bool NetAddressPrivateImpl::ValidateNetAddress( @@ -494,7 +492,7 @@ address->Assign(GetAddressBytes(net_addr)); return true; } -#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#endif // !BUILDFLAG(IS_NACL) // static std::string NetAddressPrivateImpl::DescribeNetAddress(
diff --git a/shared_impl/private/net_address_private_impl.h b/shared_impl/private/net_address_private_impl.h index 4222b55..8ee80de 100644 --- a/shared_impl/private/net_address_private_impl.h +++ b/shared_impl/private/net_address_private_impl.h
@@ -9,12 +9,11 @@ #include <string> #include "build/build_config.h" -#include "components/nacl/common/buildflags.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/ppb_net_address.h" #include "ppapi/shared_impl/ppapi_shared_export.h" -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) #include "net/base/ip_address.h" //nogncheck #endif @@ -29,7 +28,7 @@ NetAddressPrivateImpl(const NetAddressPrivateImpl&) = delete; NetAddressPrivateImpl& operator=(const NetAddressPrivateImpl&) = delete; -#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN) +#if !BUILDFLAG(IS_NACL) static bool ValidateNetAddress(const PP_NetAddress_Private& addr); static bool SockaddrToNetAddress(const sockaddr* sa,