Move CPDF_PageObjectHolder::m_pFormStream to CPDF_Form.
This member variable is only used in the CPDF_Form subclass.
Change-Id: Ib922228e51f5c3b370027e565d04ffe47374a320
Reviewed-on: https://pdfium-review.googlesource.com/33830
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp
index c74a889..82f288f 100644
--- a/core/fpdfapi/page/cpdf_contentparser.cpp
+++ b/core/fpdfapi/page/cpdf_contentparser.cpp
@@ -106,7 +106,7 @@
pState->SetSoftMask(nullptr);
}
RetainPtr<CPDF_StreamAcc> pSingleStream =
- pdfium::MakeRetain<CPDF_StreamAcc>(pForm->m_pFormStream.Get());
+ pdfium::MakeRetain<CPDF_StreamAcc>(pForm->GetStream());
pSingleStream->LoadAllDataFiltered();
m_StreamArray.push_back(pSingleStream);
}
diff --git a/core/fpdfapi/page/cpdf_form.cpp b/core/fpdfapi/page/cpdf_form.cpp
index a63d3ce..5132029 100644
--- a/core/fpdfapi/page/cpdf_form.cpp
+++ b/core/fpdfapi/page/cpdf_form.cpp
@@ -50,3 +50,7 @@
ContinueParse(nullptr);
}
+
+const CPDF_Stream* CPDF_Form::GetStream() const {
+ return m_pFormStream.Get();
+}
diff --git a/core/fpdfapi/page/cpdf_form.h b/core/fpdfapi/page/cpdf_form.h
index 9f2987d..155a6ae 100644
--- a/core/fpdfapi/page/cpdf_form.h
+++ b/core/fpdfapi/page/cpdf_form.h
@@ -32,8 +32,12 @@
CPDF_Type3Char* pType3Char,
std::set<const uint8_t*>* parsedSet);
+ const CPDF_Stream* GetStream() const;
+
private:
std::unique_ptr<std::set<const uint8_t*>> m_ParsedSet;
+
+ UnownedPtr<CPDF_Stream> m_pFormStream;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_FORM_H_
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h
index 6100444..816a294 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.h
@@ -84,8 +84,6 @@
void Transform(const CFX_Matrix& matrix);
CFX_FloatRect CalcBoundingBox() const;
- // TODO(thestig): Move |m_pFormStream| into CPDF_Form.
- UnownedPtr<CPDF_Stream> m_pFormStream;
UnownedPtr<CPDF_Dictionary> m_pPageResources;
UnownedPtr<CPDF_Dictionary> m_pResources;
std::map<GraphicsData, ByteString> m_GraphicsMap;