| Index: experimental/PdfViewer/SkPdfUtils.h
 | 
| ===================================================================
 | 
| --- experimental/PdfViewer/SkPdfUtils.h	(revision 10712)
 | 
| +++ experimental/PdfViewer/SkPdfUtils.h	(working copy)
 | 
| @@ -1,12 +1,60 @@
 | 
|  #ifndef __DEFINED__SkPdfUtils
 | 
|  #define __DEFINED__SkPdfUtils
 | 
|  
 | 
| -#include "SkPdfBasics.h"
 | 
| +#include "SkMatrix.h"
 | 
| +#include "SkRect.h"
 | 
|  
 | 
|  class SkPdfArray;
 | 
| +class SkPdfContext;
 | 
| +class SkCanvas;
 | 
| +class SkPdfNativeObject;
 | 
|  
 | 
| +// TODO(edisonn): temporary code, to report how much of the PDF we actually think we rendered.
 | 
| +enum SkPdfResult {
 | 
| +    kOK_SkPdfResult,
 | 
| +    kPartial_SkPdfResult,
 | 
| +    kNYI_SkPdfResult,
 | 
| +    kIgnoreError_SkPdfResult,
 | 
| +    kError_SkPdfResult,
 | 
| +    kUnsupported_SkPdfResult,
 | 
| +
 | 
| +    kCount_SkPdfResult
 | 
| +};
 | 
| +
 | 
| +struct NotOwnedString {
 | 
| +    const unsigned char* fBuffer;
 | 
| +    size_t fBytes;
 | 
| +
 | 
| +    static void init(NotOwnedString* str) {
 | 
| +        str->fBuffer = NULL;
 | 
| +        str->fBytes = 0;
 | 
| +    }
 | 
| +
 | 
| +    static void init(NotOwnedString* str, const char* sz) {
 | 
| +        str->fBuffer = (const unsigned char*)sz;
 | 
| +        str->fBytes = strlen(sz);
 | 
| +    }
 | 
| +
 | 
| +    bool equals(const char* sz) {
 | 
| +        return strncmp((const char*)fBuffer, sz, fBytes) == 0 && fBytes == strlen(sz);
 | 
| +
 | 
| +    }
 | 
| +};
 | 
| +
 | 
|  SkMatrix SkMatrixFromPdfArray(SkPdfArray* pdfArray);
 | 
|  
 | 
| -PdfResult doType3Char(PdfContext* pdfContext, SkCanvas* canvas, const SkPdfObject* skobj, SkRect bBox, SkMatrix matrix, double textSize);
 | 
| +SkPdfResult doType3Char(SkPdfContext* pdfContext, SkCanvas* canvas, const SkPdfNativeObject* skobj, SkRect bBox, SkMatrix matrix, double textSize);
 | 
|  
 | 
| +////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
| +//
 | 
| +// TRACE functions
 | 
| +//
 | 
| +#ifdef PDF_TRACE
 | 
| +void SkTraceMatrix(const SkMatrix& matrix, const char* sz);
 | 
| +void SkTraceRect(const SkRect& rect, const char* sz);
 | 
| +#else
 | 
| +#define SkTraceMatrix(a,b)
 | 
| +#define SkTraceRect(a,b)
 | 
| +#endif
 | 
| +
 | 
|  #endif   // __DEFINED__SkPdfUtils
 | 
| 
 |