Apply pdfium_noshorten_config to testing/
Apply checked_casts<> to comply with some pre-existing APIs.
Change-Id: I4d45f8976861d93cfb09a688b18c56554def32bd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90852
Reviewed-by: Lei Zhang <thestig@chromium.org>
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/testing/BUILD.gn b/testing/BUILD.gn
index 261e6e7..0a23439 100644
--- a/testing/BUILD.gn
+++ b/testing/BUILD.gn
@@ -40,7 +40,10 @@
"../core/fxge",
"image_diff",
]
- configs += [ "../:pdfium_strict_config" ]
+ configs += [
+ "../:pdfium_strict_config",
+ "../:pdfium_noshorten_config",
+ ]
visibility = [ "../*" ]
if (pdf_enable_v8) {
sources += [
@@ -62,7 +65,10 @@
"utils/path_service.h",
]
deps = [ "../core/fxcrt" ]
- configs += [ "../:pdfium_strict_config" ]
+ configs += [
+ "../:pdfium_strict_config",
+ "../:pdfium_noshorten_config",
+ ]
visibility = [ "../*" ]
}
@@ -78,7 +84,10 @@
"../core/fxge",
"//testing/gtest",
]
- configs += [ "../:pdfium_strict_config" ]
+ configs += [
+ "../:pdfium_strict_config",
+ "../:pdfium_noshorten_config",
+ ]
if (pdf_enable_v8) {
sources += [
"v8_test_environment.cpp",
@@ -107,7 +116,10 @@
testonly = true
sources = []
deps = []
- configs += [ "../:pdfium_strict_config" ]
+ configs += [
+ "../:pdfium_strict_config",
+ "../:pdfium_noshorten_config",
+ ]
public_deps = [
":test_environments",
":test_support",
@@ -164,7 +176,10 @@
":test_environments",
":test_support",
]
- configs += [ "../:pdfium_strict_config" ]
+ configs += [
+ "../:pdfium_strict_config",
+ "../:pdfium_noshorten_config",
+ ]
visibility = [ "../*" ]
if (pdf_enable_v8) {
sources += [
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index 496cf3b..794acf3 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -24,6 +24,7 @@
#include "third_party/base/check.h"
#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
+#include "third_party/base/numerics/safe_conversions.h"
#ifdef PDF_ENABLE_V8
#include "testing/v8_test_environment.h"
@@ -388,7 +389,7 @@
FPDF_RenderPage(dc, page, 0, 0, width, height, 0, flags);
HENHMETAFILE emf = CloseEnhMetaFile(dc);
- size_t size_in_bytes = GetEnhMetaFileBits(emf, 0, nullptr);
+ UINT size_in_bytes = GetEnhMetaFileBits(emf, 0, nullptr);
std::vector<uint8_t> buffer(size_in_bytes);
GetEnhMetaFileBits(emf, size_in_bytes, buffer.data());
DeleteEnhMetaFile(emf);
@@ -399,7 +400,8 @@
std::string EmbedderTest::GetPostScriptFromEmf(
pdfium::span<const uint8_t> emf_data) {
// This comes from Emf::InitFromData() in Chromium.
- HENHMETAFILE emf = SetEnhMetaFileBits(emf_data.size(), emf_data.data());
+ HENHMETAFILE emf = SetEnhMetaFileBits(
+ pdfium::base::checked_cast<UINT>(emf_data.size()), emf_data.data());
if (!emf)
return std::string();
@@ -453,7 +455,8 @@
FPDF_DOCUMENT EmbedderTest::OpenSavedDocumentWithPassword(
const char* password) {
memset(&saved_file_access_, 0, sizeof(saved_file_access_));
- saved_file_access_.m_FileLen = data_string_.size();
+ saved_file_access_.m_FileLen =
+ pdfium::base::checked_cast<unsigned long>(data_string_.size());
saved_file_access_.m_GetBlock = GetBlockFromString;
// Copy data to prevent clearing it before saved document close.
saved_document_file_data_ = data_string_;
diff --git a/testing/range_set.cpp b/testing/range_set.cpp
index 449ea9e..5df789e 100644
--- a/testing/range_set.cpp
+++ b/testing/range_set.cpp
@@ -53,9 +53,8 @@
--end;
- const int new_start = std::min<size_t>(start->first, fixed_range.first);
- const int new_end = std::max(end->second, fixed_range.second);
-
+ const size_t new_start = std::min(start->first, fixed_range.first);
+ const size_t new_end = std::max(end->second, fixed_range.second);
ranges_.erase(start, ++end);
ranges_.insert(Range(new_start, new_end));
}
diff --git a/testing/utils/file_util.cpp b/testing/utils/file_util.cpp
index 5d26d98..6860be7 100644
--- a/testing/utils/file_util.cpp
+++ b/testing/utils/file_util.cpp
@@ -8,6 +8,7 @@
#include <string.h>
#include "testing/utils/path_service.h"
+#include "third_party/base/numerics/safe_conversions.h"
std::unique_ptr<char, pdfium::FreeDeleter> GetFileContents(const char* filename,
size_t* retlen) {
@@ -55,7 +56,7 @@
unsigned char* pBuf,
unsigned long size) {
memcpy(pBuf, file_contents_.get() + pos, size);
- return size;
+ return pdfium::base::checked_cast<int>(size);
}
// static
diff --git a/testing/v8_initializer.cpp b/testing/v8_initializer.cpp
index 9b295d0..b6499db 100644
--- a/testing/v8_initializer.cpp
+++ b/testing/v8_initializer.cpp
@@ -9,6 +9,7 @@
#include "public/fpdfview.h"
#include "testing/utils/file_util.h"
#include "testing/utils/path_service.h"
+#include "third_party/base/numerics/safe_conversions.h"
#include "v8/include/libplatform/libplatform.h"
#include "v8/include/v8.h"
@@ -53,7 +54,7 @@
return false;
result_data->data = data_buffer.release();
- result_data->raw_size = data_length;
+ result_data->raw_size = pdfium::base::checked_cast<int>(data_length);
return true;
}
#endif // V8_USE_EXTERNAL_STARTUP_DATA
