diff options
| author |  edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-04 17:29:06 +0000 |
|---|---|---|
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-04 17:29:06 +0000 |
| commit | e91260c3e75d9d26e391be6823ea37373b27d1ff (patch) | |
| tree | fab67ee5d909f1f6b7dcee1366eec7aa3c695a3b | |
| parent | bd6343b1d60d2a85e930f33f4b06b4502b3e8caa (diff) | |
pdfviewer: fix break, include the right header.
Review URL: https://codereview.chromium.org/23493018
git-svn-id: http://skia.googlecode.com/svn/trunk@11083 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | experimental/PdfViewer/SkPdfRenderer.cpp | 1 | ||||
| -rw-r--r-- | experimental/PdfViewer/SkTrackDevice.h | 2 | ||||
| -rw-r--r-- | experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/experimental/PdfViewer/SkPdfRenderer.cpp b/experimental/PdfViewer/SkPdfRenderer.cpp index 57b41c8912..e18c339925 100644 --- a/experimental/PdfViewer/SkPdfRenderer.cpp +++ b/experimental/PdfViewer/SkPdfRenderer.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkBitmapDevice.h" #include "SkCanvas.h" #include "SkDevice.h" #include "SkForceLinking.h" diff --git a/experimental/PdfViewer/SkTrackDevice.h b/experimental/PdfViewer/SkTrackDevice.h index 2b8a8eab2d..9c26a4e481 100644 --- a/experimental/PdfViewer/SkTrackDevice.h +++ b/experimental/PdfViewer/SkTrackDevice.h @@ -8,7 +8,7 @@ #ifndef SkTrackDevice_DEFINED #define SkTrackDevice_DEFINED -#include "SkDevice.h" +#include "SkBitmapDevice.h" #include "SkTracker.h" class SkTrackDevice : public SkBitmapDevice { diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp index 42654ffa72..73f42fabe7 100644 --- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp @@ -971,7 +971,7 @@ bool SkPdfNativeTokenizer::readTokenCore(PdfToken* token) { printf("break;\n"); } #endif - printf("%i READ %s %s\n", read_op, token->fType == kKeyword_TokenType ? "Keyword" : "Object", token->fKeyword ? std::string(token->fKeyword, token->fKeywordLength).c_str() : token->fObject->toString().c_str()); + printf("%i READ %s %s\n", read_op, token->fType == kKeyword_TokenType ? "Keyword" : "Object", token->fKeyword ? SkString(token->fKeyword, token->fKeywordLength).c_str() : token->fObject->toString().c_str()); #endif return true; @@ -982,7 +982,7 @@ void SkPdfNativeTokenizer::PutBack(PdfToken token) { fHasPutBack = true; fPutBack = token; #ifdef PDF_TRACE_READ_TOKEN - printf("PUT_BACK %s %s\n", token.fType == kKeyword_TokenType ? "Keyword" : "Object", token.fKeyword ? std::string(token.fKeyword, token.fKeywordLength).c_str(): token.fObject->toString().c_str()); + printf("PUT_BACK %s %s\n", token.fType == kKeyword_TokenType ? "Keyword" : "Object", token.fKeyword ? SkString(token.fKeyword, token.fKeywordLength).c_str(): token.fObject->toString().c_str()); #endif } @@ -991,7 +991,7 @@ bool SkPdfNativeTokenizer::readToken(PdfToken* token) { *token = fPutBack; fHasPutBack = false; #ifdef PDF_TRACE_READ_TOKEN - printf("READ_BACK %s %s\n", token->fType == kKeyword_TokenType ? "Keyword" : "Object", token->fKeyword ? std::string(token->fKeyword, token->fKeywordLength).c_str() : token->fObject->toString().c_str()); + printf("READ_BACK %s %s\n", token->fType == kKeyword_TokenType ? "Keyword" : "Object", token->fKeyword ? SkString(token->fKeyword, token->fKeywordLength).c_str() : token->fObject->toString().c_str()); #endif return true; } |