From 62b218074ea2bc658488c583362930a798b39107 Mon Sep 17 00:00:00 2001
From: Artem Strygin <art-snake@yandex-team.ru>
Date: Mon, 2 Oct 2017 22:07:55 +0300
Subject: Improve CPDF_ReadVaildator

Merge CPDF_ReadValidator::IsXXXAvailable and CPDF_ReadValidator::SheduleXXXDowload
methods into one CheckXXXAndRequestIfUnavailable.

Change-Id: Ib108d5bc3589df17269c841b0024dd4690909304
Reviewed-on: https://pdfium-review.googlesource.com/13730
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Art Snake <art-snake@yandex-team.ru>
---
 core/fpdfapi/parser/cpdf_read_validator.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/fpdfapi/parser/cpdf_read_validator.h')

diff --git a/core/fpdfapi/parser/cpdf_read_validator.h b/core/fpdfapi/parser/cpdf_read_validator.h
index 0bbf6ab924..0fb15b20f8 100644
--- a/core/fpdfapi/parser/cpdf_read_validator.h
+++ b/core/fpdfapi/parser/cpdf_read_validator.h
@@ -37,11 +37,10 @@ class CPDF_ReadValidator : public IFX_SeekableReadStream {
 
   void ResetErrors();
 
-  bool IsDataRangeAvailable(FX_FILESIZE offset, uint32_t size) const;
   bool IsWholeFileAvailable();
 
-  void ScheduleDataDownload(FX_FILESIZE offset, uint32_t size);
-  void ScheduleDownloadWholeFile();
+  bool CheckDataRangeAndRequestIfUnavailable(FX_FILESIZE offset, size_t size);
+  bool CheckWholeFileAndRequestIfUnavailable();
 
   // IFX_SeekableReadStream overrides:
   bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
@@ -54,6 +53,7 @@ class CPDF_ReadValidator : public IFX_SeekableReadStream {
 
  private:
   void ScheduleDownload(FX_FILESIZE offset, size_t size);
+  bool IsDataRangeAvailable(FX_FILESIZE offset, size_t size) const;
 
   RetainPtr<IFX_SeekableReadStream> file_read_;
   UnownedPtr<CPDF_DataAvail::FileAvail> file_avail_;
-- 
cgit v1.2.3