Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2796)

Unified Diff: experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp

Issue 23163007: pdfviewer: make pdfviewer compile on mac Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
===================================================================
--- experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp (revision 10716)
+++ experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp (working copy)
@@ -7,10 +7,13 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "SkPdfFileTrailerDictionary_autogen.h"
-#include "SkPdfCatalogDictionary_autogen.h"
-#include "SkPdfPageObjectDictionary_autogen.h"
-#include "SkPdfPageTreeNodeDictionary_autogen.h"
+// TODO(edisonn): for some reason on mac these files are found here, but are found from headers
+//#include "SkPdfFileTrailerDictionary_autogen.h"
+//#include "SkPdfCatalogDictionary_autogen.h"
+//#include "SkPdfPageObjectDictionary_autogen.h"
+//#include "SkPdfPageTreeNodeDictionary_autogen.h"
+#include "SkPdfHeaders_autogen.h"
+
#include "SkPdfMapper_autogen.h"
#include "SkStream.h"
@@ -361,7 +364,7 @@
const unsigned char* current = fFileContent + startOffset;
const unsigned char* end = fFileContent + fContentLength;
- SkPdfNativeTokenizer tokenizer(current, end - current, fMapper, fAllocator, this);
+ SkPdfNativeTokenizer tokenizer(current, end - current, fAllocator, this);
SkPdfNativeObject idObj;
SkPdfNativeObject generationObj;
@@ -465,7 +468,7 @@
return NULL;
}
- return new SkPdfNativeTokenizer(stream, fMapper, allocator, this);
+ return new SkPdfNativeTokenizer(stream, allocator, this);
}
// TODO(edisonn): NYI
@@ -473,7 +476,7 @@
SkPdfAllocator* allocator) {
// warning does not track two calls in the same buffer! the buffer is updated!
// make a clean copy if needed!
- return new SkPdfNativeTokenizer(buffer, len, fMapper, allocator, this);
+ return new SkPdfNativeTokenizer(buffer, len, allocator, this);
}
size_t SkPdfNativeDoc::objects() const {
« no previous file with comments | « experimental/PdfViewer/pdf_viewer_main.cpp ('k') | experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698