0

Remove remaining uses of NACL_WIN64 ifdef

Since revision 517bec58eb, this define is never set anymore.

Bug: b/303417958
Change-Id: Ic0b23fc64b323f3e64d5b70c455c807c59afd93b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5105506
Reviewed-by: Fabian Sommer <fabiansommer@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Derek Schuff <dschuff@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1235893}
This commit is contained in:
Derek Schuff
2023-12-11 19:46:09 +00:00
committed by Chromium LUCI CQ
parent b7d926ac84
commit 767eaa5193
14 changed files with 26 additions and 39 deletions

@ -35,7 +35,6 @@ ChromeCrashReporterClient::ChromeCrashReporterClient() {}
ChromeCrashReporterClient::~ChromeCrashReporterClient() {}
#if !defined(NACL_WIN64)
// static
void ChromeCrashReporterClient::InitializeCrashReportingForProcess() {
static ChromeCrashReporterClient* instance = nullptr;
@ -64,7 +63,6 @@ void ChromeCrashReporterClient::InitializeCrashReportingForProcess() {
install_static::WideToUTF8(user_data_dir), base::FilePath());
}
}
#endif // !defined(NACL_WIN64)
bool ChromeCrashReporterClient::GetAlternativeCrashDumpLocation(
std::wstring* crash_dir) {

@ -9,12 +9,10 @@
class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient {
public:
#if !defined(NACL_WIN64)
// Instantiates a process wide instance of the ChromeCrashReporterClient
// class and initializes crash reporting for the process. The instance is
// leaked.
static void InitializeCrashReportingForProcess();
#endif // !defined(NACL_WIN64)
ChromeCrashReporterClient();

@ -5,7 +5,7 @@
#ifndef GPU_COMMAND_BUFFER_CLIENT_WEBGPU_EXPORT_H_
#define GPU_COMMAND_BUFFER_CLIENT_WEBGPU_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(WEBGPU_IMPLEMENTATION)

@ -5,7 +5,7 @@
#ifndef GPU_GPU_EXPORT_H_
#define GPU_GPU_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(GPU_IMPLEMENTATION)

@ -5,7 +5,7 @@
#ifndef GPU_GPU_GLES2_EXPORT_H_
#define GPU_GPU_GLES2_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(GPU_GLES2_IMPLEMENTATION)

@ -5,7 +5,7 @@
#ifndef GPU_GPU_UTIL_EXPORT_H_
#define GPU_GPU_UTIL_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(GPU_UTIL_IMPLEMENTATION)

@ -5,7 +5,7 @@
#ifndef GPU_IPC_SERVICE_GPU_IPC_SERVICE_EXPORT_H_
#define GPU_IPC_SERVICE_GPU_IPC_SERVICE_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(GPU_IPC_SERVICE_IMPLEMENTATION)

@ -5,7 +5,7 @@
#ifndef GPU_RASTER_EXPORT_H_
#define GPU_RASTER_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(RASTER_IMPLEMENTATION)

@ -458,13 +458,13 @@ IPC_SYNC_MESSAGE_CONTROL1_1(PpapiMsg_SupportsInterface,
std::string /* interface_name */,
bool /* result */)
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// Network state notification from the browser for implementing
// PPP_NetworkState_Dev.
IPC_MESSAGE_CONTROL1(PpapiMsg_SetNetworkState,
bool /* online */)
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
// PPB_Audio.
@ -617,13 +617,13 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPPTextInput_RequestSurroundingText,
PP_Instance /* instance */,
uint32_t /* desired_number_of_characters */)
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// PPP_Instance_Private.
IPC_SYNC_MESSAGE_ROUTED1_1(PpapiMsg_PPPInstancePrivate_GetInstanceObject,
PP_Instance /* instance */,
ppapi::proxy::SerializedVar /* result */)
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
// This message is sent from the renderer to the PNaCl compiler process
// (NaCl untrusted code -- a nexe). This implements the init_callback()
@ -954,7 +954,7 @@ IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVar_CreateObjectDeprecated,
int64_t /* object_data */,
ppapi::proxy::SerializedVar /* result */)
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// PPB_Buffer.
IPC_SYNC_MESSAGE_ROUTED2_2(
PpapiHostMsg_PPBBuffer_Create,
@ -963,7 +963,7 @@ IPC_SYNC_MESSAGE_ROUTED2_2(
ppapi::HostResource /* result_resource */,
ppapi::proxy::SerializedHandle /* result_shm_handle */)
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
// PPB_Testing.
IPC_SYNC_MESSAGE_ROUTED3_1(
@ -982,7 +982,7 @@ IPC_SYNC_MESSAGE_ROUTED1_0(
PpapiHostMsg_PPBTesting_SetMinimumArrayBufferSizeForShmem,
uint32_t /* threshold */)
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// PPB_VideoDecoder_Dev.
// (Messages from plugin to renderer.)
@ -1037,7 +1037,7 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_PictureReady,
IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_NotifyError,
ppapi::HostResource /* video_decoder */,
PP_VideoDecodeError_Dev /* error */)
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
//-----------------------------------------------------------------------------
// Resource call/reply messages.
@ -1763,7 +1763,7 @@ IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoEncoder_NotifyError,
int32_t /* error */)
IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoEncoder_Close)
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// Audio input.
IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Create)
@ -1844,6 +1844,6 @@ IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
uint32_t /* buffer */)
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
#endif // PPAPI_PROXY_PPAPI_MESSAGES_H_

@ -319,7 +319,7 @@ void ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Log(
std::string* l) {
}
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// SerializedDirEntry ----------------------------------------------------------
// static
@ -375,9 +375,9 @@ void ParamTraits<ppapi::proxy::SerializedFontDescription>::Log(
const param_type& p,
std::string* l) {
}
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
// ppapi::PepperFilePath -------------------------------------------------------
// static
@ -413,7 +413,7 @@ void ParamTraits<ppapi::PepperFilePath>::Log(const param_type& p,
l->append(")");
}
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
// PPB_X509Certificate_Fields --------------------------------------------------

@ -5,7 +5,7 @@
#ifndef PPAPI_PROXY_PPAPI_PROXY_EXPORT_H_
#define PPAPI_PROXY_PPAPI_PROXY_EXPORT_H_
#if defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(PPAPI_PROXY_IMPLEMENTATION)
@ -22,7 +22,7 @@
#endif
#endif
#else // defined(COMPONENT_BUILD) && !defined(NACL_WIN64)
#else // defined(COMPONENT_BUILD)
#define PPAPI_PROXY_EXPORT
#endif

@ -322,7 +322,7 @@ Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance,
new_singleton = new UMAPrivateResource(connection, instance);
break;
// Flash/trusted resources aren't needed for NaCl.
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#if !BUILDFLAG(IS_NACL)
case BROWSER_FONT_SINGLETON_ID:
new_singleton = new BrowserFontSingletonResource(connection, instance);
break;
@ -330,7 +330,7 @@ Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance,
case BROWSER_FONT_SINGLETON_ID:
NOTREACHED();
break;
#endif // !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64)
#endif // !BUILDFLAG(IS_NACL)
}
if (!new_singleton.get()) {

@ -66,18 +66,12 @@ SerializedVar::Inner::~Inner() {
PP_Var SerializedVar::Inner::GetVar() {
DCHECK(serialization_rules_.get());
#if defined(NACL_WIN64)
NOTREACHED();
return PP_MakeUndefined();
#else
if (raw_var_data_.get()) {
var_ = raw_var_data_->CreatePPVar(instance_);
raw_var_data_.reset(nullptr);
}
return var_;
#endif
}
void SerializedVar::Inner::SetVar(PP_Var var) {

@ -8,8 +8,7 @@
#include "build/build_config.h"
#include "components/nacl/common/buildflags.h"
#if !BUILDFLAG(IS_NACL) && !defined(NACL_WIN64) && \
!BUILDFLAG(IS_MINIMAL_TOOLCHAIN)
#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MINIMAL_TOOLCHAIN)
#include "third_party/skia/include/core/SkTypes.h" //nogncheck
#endif
@ -22,9 +21,7 @@ PP_ImageDataFormat PPB_ImageData_Shared::GetNativeImageDataFormat() {
// later.
// TODO(dmichael): Really proxy this.
return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
#elif defined(NACL_WIN64) || BUILDFLAG(IS_MINIMAL_TOOLCHAIN)
// In the NaCl Win64 helper, this shouldn't be called. If we start building
// Chrome on Windows 64 for realz, we should really implement this.
#elif BUILDFLAG(IS_MINIMAL_TOOLCHAIN)
NOTIMPLEMENTED();
return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
#else