Revert "[PDF] Refactor SkPDFFont to enable font/cmap subsetting."
The PDF xref table is corrupt with this change. Revert until we figure it out.
Review URL: http://codereview.appspot.com/4803049
git-svn-id: http://skia.googlecode.com/svn/trunk@1944 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h
index 1a0807a..7a3e7bb 100644
--- a/include/pdf/SkPDFDevice.h
+++ b/include/pdf/SkPDFDevice.h
@@ -30,7 +30,6 @@
class SkPDFDict;
class SkPDFFont;
class SkPDFFormXObject;
-class SkPDFGlyphSetMap;
class SkPDFGraphicState;
class SkPDFObject;
class SkPDFShader;
@@ -151,18 +150,11 @@
* for calling data->unref() when it is finished.
*/
SK_API SkData* copyContentToData() const;
-
+
SK_API const SkMatrix& initialTransform() const {
return fInitialTransform;
}
- /** Returns a SkPDFGlyphSetMap which represents glyph usage of every font
- * that shows on this device.
- */
- const SkPDFGlyphSetMap& getFontGlyphUsage() const {
- return *(fFontGlyphUsage.get());
- }
-
private:
// TODO(vandebo) push most of SkPDFDevice's state into a core object in
// order to get the right access levels without using friend.
@@ -191,20 +183,17 @@
ContentEntry* getLastContentEntry();
void setLastContentEntry(ContentEntry* contentEntry);
- // Glyph ids used for each font on this device.
- SkTScopedPtr<SkPDFGlyphSetMap> fFontGlyphUsage;
-
SkPDFDevice(const SkISize& layerSize, const SkClipStack& existingClipStack,
const SkRegion& existingClipRegion);
// override from SkDevice
- virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config config,
- int width, int height,
+ virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config config,
+ int width, int height,
bool isOpaque,
Usage usage);
void init();
- void cleanUp(bool clearFontUsage);
+ void cleanUp();
void createFormXObjectFromDevice(SkRefPtr<SkPDFFormXObject>* xobject);
// Clear the passed clip from all existing content entries.