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
This commit is contained in:
vandebo@chromium.org 2012-03-21 17:55:04 +00:00
Родитель f7f9aa8bd9
Коммит 008c498b58
13 изменённых файлов: 18 добавлений и 37 удалений

Просмотреть файл

Просмотреть файл

@ -22,7 +22,7 @@
The PDF catalog manages object numbers and file offsets. It is used
to create the PDF cross reference table.
*/
class SkPDFCatalog {
class SK_API SkPDFCatalog {
public:
/** Create a PDF catalog.
*/

Просмотреть файл

@ -10,17 +10,15 @@
#ifndef SkPDFDocument_DEFINED
#define SkPDFDocument_DEFINED
#include "SkAdvancedTypefaceMetrics.h"
#include "SkPDFTypes.h"
#include "SkRefCnt.h"
#include "SkTDArray.h"
#include "SkTScopedPtr.h"
class SkPDFCatalog;
class SkPDFDevice;
class SkPDFDict;
class SkPDFPage;
class SkPDFObject;
class SkWStream;
class SkWSteam;
/** \class SkPDFDocument
@ -64,10 +62,9 @@ public:
*/
SK_API bool appendPage(SkPDFDevice* pdfDevice);
/** Get the count of unique font types used in the document.
/** Get the list of pages in this document.
*/
SK_API void getCountOfFontTypes(
int counts[SkAdvancedTypefaceMetrics::kNotEmbeddable_Font + 1]) const;
SK_API const SkTDArray<SkPDFPage*>& getPages();
private:
SkTScopedPtr<SkPDFCatalog> fCatalog;

Просмотреть файл

@ -79,27 +79,27 @@ private:
*/
class SkPDFFont : public SkPDFDict {
public:
virtual ~SkPDFFont();
SK_API virtual ~SkPDFFont();
virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
SK_API virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
/** Returns the typeface represented by this class. Returns NULL for the
* default typeface.
*/
SkTypeface* typeface();
SK_API SkTypeface* typeface();
/** Returns the font type represented in this font. For Type0 fonts,
* returns the type of the decendant font.
*/
virtual SkAdvancedTypefaceMetrics::FontType getType();
SK_API virtual SkAdvancedTypefaceMetrics::FontType getType();
/** Returns true if this font encoding supports glyph IDs above 255.
*/
virtual bool multiByteGlyphs() const = 0;
SK_API virtual bool multiByteGlyphs() const = 0;
/** Return true if this font has an encoding for the passed glyph id.
*/
bool hasGlyph(uint16_t glyphID);
SK_API bool hasGlyph(uint16_t glyphID);
/** Convert (in place) the input glyph IDs into the font encoding. If the
* font has more glyphs than can be encoded (like a type 1 font with more
@ -109,7 +109,7 @@ public:
* @param numGlyphs The number of input glyphs.
* @return Returns the number of glyphs consumed.
*/
size_t glyphsToPDFFontEncoding(uint16_t* glyphIDs, size_t numGlyphs);
SK_API size_t glyphsToPDFFontEncoding(uint16_t* glyphIDs, size_t numGlyphs);
/** Get the font resource for the passed typeface and glyphID. The
* reference count of the object is incremented and it is the caller's
@ -119,7 +119,7 @@ public:
* @param typeface The typeface to find.
* @param glyphID Specify which section of a large font is of interest.
*/
static SkPDFFont* GetFontResource(SkTypeface* typeface,
SK_API static SkPDFFont* GetFontResource(SkTypeface* typeface,
uint16_t glyphID);
/** Subset the font based on usage set. Returns a SkPDFFont instance with
@ -128,7 +128,7 @@ public:
* @return NULL if font does not support subsetting, a new instance
* of SkPDFFont otherwise.
*/
virtual SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage);
SK_API virtual SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage);
protected:
// Common constructor to handle common members.

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -82,7 +82,7 @@ public:
/** Get the fonts used on this page.
*/
const SkTDArray<SkPDFFont*>& getFontResources() const;
SK_API const SkTDArray<SkPDFFont*>& getFontResources() const;
/** Returns a SkPDFGlyphSetMap which represents glyph usage of every font
* that shows on this page.

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -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 @@ bool SkPDFDocument::appendPage(SkPDFDevice* pdfDevice) {
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) {