Move CPDF_Annot and CPDF_AnnotList to their own header.

core/fpdfdoc/cpdf_annotlist.h

Index: core/fpdfdoc/cpdf_annotlist.h
diff --git a/core/fpdfdoc/cpdf_annotlist.h b/core/fpdfdoc/cpdf_annotlist.h
new file mode 100644
index 0000000000000000000000000000000000000000..afe85f33af4ab5802c36c23f6fc73302d4896b39
--- /dev/null
+++ b/core/fpdfdoc/cpdf_annotlist.h
@@ -0,0 +1,64 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef CORE_FPDFDOC_CPDF_ANNOTLIST_H_
+#define CORE_FPDFDOC_CPDF_ANNOTLIST_H_
+
+#include <memory>
+#include <vector>
+
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
+
+class CFX_RenderDevice;
+class CPDF_Annot;
+class CPDF_Document;
+class CPDF_Page;
+class CPDF_RenderContext;
+class CPDF_RenderOptions;
+
+class CPDF_AnnotList {
+ public:
+  explicit CPDF_AnnotList(CPDF_Page* pPage);
+  ~CPDF_AnnotList();
+
+  void DisplayAnnots(CPDF_Page* pPage,
+                     CPDF_RenderContext* pContext,
+                     FX_BOOL bPrinting,
+                     CFX_Matrix* pMatrix,
+                     FX_BOOL bShowWidget,
+                     CPDF_RenderOptions* pOptions);
+
+  void DisplayAnnots(CPDF_Page* pPage,
+                     CFX_RenderDevice* pDevice,
+                     CPDF_RenderContext* pContext,
+                     FX_BOOL bPrinting,
+                     CFX_Matrix* pMatrix,
+                     uint32_t dwAnnotFlags,
+                     CPDF_RenderOptions* pOptions,
+                     FX_RECT* pClipRect);
+
+  size_t Count() const { return m_AnnotList.size(); }
+  CPDF_Annot* GetAt(size_t index) const { return m_AnnotList[index].get(); }
+  const std::vector<std::unique_ptr<CPDF_Annot>>& All() const {
+    return m_AnnotList;
+  }
+
+ private:
+  void DisplayPass(CPDF_Page* pPage,
+                   CFX_RenderDevice* pDevice,
+                   CPDF_RenderContext* pContext,
+                   FX_BOOL bPrinting,
+                   CFX_Matrix* pMatrix,
+                   FX_BOOL bWidget,
+                   CPDF_RenderOptions* pOptions,
+                   FX_RECT* clip_rect);
+
+  CPDF_Document* const m_pDocument;
+  std::vector<std::unique_ptr<CPDF_Annot>> m_AnnotList;
+};
+
+#endif  // CORE_FPDFDOC_CPDF_ANNOTLIST_H_