commit 21aef6026c6a87e1d70cd49c4f7bf8b47d38ff11
author Andrew Weintraub <asweintraub@google.com> Fri Mar 04 00:13:57 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 04 00:13:57 2022 +0000
tree 10277ddb2ff3141dfc9da1adfd225268cb0e340d
parent 39d9be24ff906896a3720a4ba63791f1882f22ca

Fix CFX_AndroidFontInfo::GetFontData return type.

Make the return type match that of its parent interface,
which is now a size_t.

PiperOrigin-RevId: 432285132
Change-Id: Iff004631224aee4f79dfa943102c851d9c1fb27c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/91191
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxge/android/cfx_androidfontinfo.cpp

diff --git a/core/fxge/android/cfx_androidfontinfo.cpp b/core/fxge/android/cfx_androidfontinfo.cpp
index 13ef554..5be6e1b 100644
--- a/core/fxge/android/cfx_androidfontinfo.cpp
+++ b/core/fxge/android/cfx_androidfontinfo.cpp
@@ -55,9 +55,9 @@
   return nullptr;
 }
 
-uint32_t CFX_AndroidFontInfo::GetFontData(void* hFont,
-                                          uint32_t table,
-                                          pdfium::span<uint8_t> buffer) {
+size_t CFX_AndroidFontInfo::GetFontData(void* hFont,
+                                        uint32_t table,
+                                        pdfium::span<uint8_t> buffer) {
   if (!hFont)
     return 0;
   return static_cast<CFPF_SkiaFont*>(hFont)->GetFontData(table, buffer);

core/fxge/android/cfx_androidfontinfo.h

diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h
index d1fcfb3..da96a5e 100644
--- a/core/fxge/android/cfx_androidfontinfo.h
+++ b/core/fxge/android/cfx_androidfontinfo.h
@@ -31,9 +31,9 @@
                 int pitch_family,
                 const ByteString& face) override;
   void* GetFont(const ByteString& face) override;
-  uint32_t GetFontData(void* hFont,
-                       uint32_t table,
-                       pdfium::span<uint8_t> buffer) override;
+  size_t GetFontData(void* hFont,
+                     uint32_t table,
+                     pdfium::span<uint8_t> buffer) override;
   bool GetFaceName(void* hFont, ByteString* name) override;
   bool GetFontCharset(void* hFont, FX_Charset* charset) override;
   void DeleteFont(void* hFont) override;