Revert "[PDF] Move most of the headers to be private."
This reverts r3453
TBR=epoger@google.com
Review URL: https://codereview.appspot.com/5869048
git-svn-id: http://skia.googlecode.com/svn/trunk@3454 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index d65efae..cb87d8f 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -10,9 +10,8 @@
#include "SkPDFCatalog.h"
#include "SkPDFDevice.h"
#include "SkPDFDocument.h"
-#include "SkPDFFont.h"
#include "SkPDFPage.h"
-#include "SkPDFTypes.h"
+#include "SkPDFFont.h"
#include "SkStream.h"
// Add the resources, starting at firstIndex to the catalog, removing any dupes.
@@ -223,23 +222,8 @@
return true;
}
-void SkPDFDocument::getCountOfFontTypes(
- int counts[SkAdvancedTypefaceMetrics::kNotEmbeddable_Font + 1]) const {
- memset(counts, 0,
- sizeof(int)* SkAdvancedTypefaceMetrics::kNotEmbeddable_Font + 1);
- SkTDArray<SkFontID> seenFonts;
-
- for (int pageNumber = 0; pageNumber < fPages.count(); pageNumber++) {
- const SkTDArray<SkPDFFont*>& fontResources =
- fPages[pageNumber]->getFontResources();
- for (int font = 0; font < fontResources.count(); font++) {
- SkFontID fontID = fontResources[font]->typeface()->uniqueID();
- if (seenFonts.find(fontID) != -1) {
- counts[fontResources[font]->getType()]++;
- seenFonts.push(fontID);
- }
- }
- }
+const SkTDArray<SkPDFPage*>& SkPDFDocument::getPages() {
+ return fPages;
}
void SkPDFDocument::emitHeader(SkWStream* stream) {