commit 6e74cd2dd5fb24b57dca4583ebe3a02ff3039113
author Tom Sepez <tsepez@chromium.org> Thu Sep 02 16:11:01 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 02 16:11:01 2021 +0000
tree 21f3f9e26a86103c7ad31d037b212f3d3a9ae1bb
parent 3f717474c8c37d7579cfe20cd3a756955d499c94

Remove non-const form of CPDF_ColorSpace::AsPatternCS().

The only caller only requires a const version, so we can save one
slot in N subclass vtables. Also remove a NOTREACHED(), because
although it may be true in practice, in theory one should be able
to call this on any CS and check for null return.

Change-Id: Idee097f732590474d35a1033228faf6b3dce13cd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84713
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fpdfapi/page/cpdf_colorspace.cpp

diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index 3f62209..2eef08b 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -643,13 +643,7 @@
          GetFamily() == Family::kCalGray || GetFamily() == Family::kCalRGB;
 }
 
-CPDF_PatternCS* CPDF_ColorSpace::AsPatternCS() {
-  NOTREACHED();
-  return nullptr;
-}
-
 const CPDF_PatternCS* CPDF_ColorSpace::AsPatternCS() const {
-  NOTREACHED();
   return nullptr;
 }
 

core/fpdfapi/page/cpdf_colorspace.h

diff --git a/core/fpdfapi/page/cpdf_colorspace.h b/core/fpdfapi/page/cpdf_colorspace.h
index 891c278..483b837 100644
--- a/core/fpdfapi/page/cpdf_colorspace.h
+++ b/core/fpdfapi/page/cpdf_colorspace.h
@@ -115,7 +115,6 @@
   virtual bool IsNormal() const;
 
   // Returns |this| as a CPDF_PatternCS* if |this| is a pattern.
-  virtual CPDF_PatternCS* AsPatternCS();
   virtual const CPDF_PatternCS* AsPatternCS() const;
 
  protected:

core/fpdfapi/page/cpdf_patterncs.cpp

diff --git a/core/fpdfapi/page/cpdf_patterncs.cpp b/core/fpdfapi/page/cpdf_patterncs.cpp
index f66a41c..dad3db9 100644
--- a/core/fpdfapi/page/cpdf_patterncs.cpp
+++ b/core/fpdfapi/page/cpdf_patterncs.cpp
@@ -48,10 +48,6 @@
   return false;
 }
 
-CPDF_PatternCS* CPDF_PatternCS::AsPatternCS() {
-  return this;
-}
-
 const CPDF_PatternCS* CPDF_PatternCS::AsPatternCS() const {
   return this;
 }

core/fpdfapi/page/cpdf_patterncs.h

diff --git a/core/fpdfapi/page/cpdf_patterncs.h b/core/fpdfapi/page/cpdf_patterncs.h
index dda1d28..68d3509 100644
--- a/core/fpdfapi/page/cpdf_patterncs.h
+++ b/core/fpdfapi/page/cpdf_patterncs.h
@@ -28,7 +28,6 @@
               float* R,
               float* G,
               float* B) const override;
-  CPDF_PatternCS* AsPatternCS() override;
   const CPDF_PatternCS* AsPatternCS() const override;
   uint32_t v_Load(CPDF_Document* pDoc,
                   const CPDF_Array* pArray,