diff options
author | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-14 19:09:27 +0000 |
---|---|---|
committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-14 19:09:27 +0000 |
commit | 909228992c1671ea7451d1c6bc588a8ec991841e (patch) | |
tree | 5ddd2c2f4f1fc2f94f51512a49cfccbae83a4cd4 /gyp | |
parent | be65a4c9d6ce40e7fc27e5a830196bcaa7be97c9 (diff) |
Pdfviewer refactoring.
Mostly superficial changes, to help me make sure I understand the
code while making modifications.
SkPdfRenderer:
First class I'm modifying. Move it into include/ and src/ directories.
Inherit from SkNoncopyable.
Replace load() with factory function which returns NULL if the load
fails.
Remove unload() and loaded(), which no longer make sense, since the
factory will return NULL on a failure to load, and unload() happens
on destruction.
Use a const char* for loading a PDF, following the convention of
SkStream::NewFromFile.
Remove unnecessary call to sqrt in SkPDFNativeRenderToBitmap.
Also in SkPDFNativeRenderToBitmap, use an appropriate SkScalar macro
to convert to an integer.
Use this-> when calling member functions.
pdf_viewer_main.cpp:
Call the new interface for SkPdfRenderer.
gyp files:
Refer to the new location of SkPdfRenderer.
R=edisonn@google.com
Review URL: https://codereview.chromium.org/59493011
git-svn-id: http://skia.googlecode.com/svn/trunk@12296 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/SampleApp.gyp | 3 | ||||
-rw-r--r-- | gyp/gm.gyp | 2 | ||||
-rw-r--r-- | gyp/pdfviewer.gyp | 1 | ||||
-rw-r--r-- | gyp/pdfviewer_lib.gyp | 7 |
4 files changed, 10 insertions, 3 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 3a0770296b..2708036d84 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -1,3 +1,4 @@ +# { 'variables': { #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp @@ -167,7 +168,7 @@ 'pdfviewer_lib.gyp:pdfviewer_lib', ], 'include_dirs' : [ - '../experimental/PdfViewer/', + '../experimental/PdfViewer/inc', ], 'sources': [ '../samplecode/SamplePdfFileViewer.cpp', diff --git a/gyp/gm.gyp b/gyp/gm.gyp index 504b11ec20..90c09a4f24 100644 --- a/gyp/gm.gyp +++ b/gyp/gm.gyp @@ -65,7 +65,7 @@ 'SK_BUILD_NATIVE_PDF_RENDERER', ], 'include_dirs' : [ - '../experimental/PdfViewer', + '../experimental/PdfViewer/inc', ], 'dependencies': [ 'pdfviewer_lib.gyp:pdfviewer_lib', diff --git a/gyp/pdfviewer.gyp b/gyp/pdfviewer.gyp index 1f7877f179..763587710d 100644 --- a/gyp/pdfviewer.gyp +++ b/gyp/pdfviewer.gyp @@ -16,6 +16,7 @@ ], 'include_dirs': [ '../experimental/PdfViewer', + '../experimental/PdfViewer/inc', '../experimental/PdfViewer/pdfparser', '../experimental/PdfViewer/pdfparser/native', ], diff --git a/gyp/pdfviewer_lib.gyp b/gyp/pdfviewer_lib.gyp index f9acdd6432..e25e024166 100644 --- a/gyp/pdfviewer_lib.gyp +++ b/gyp/pdfviewer_lib.gyp @@ -9,9 +9,13 @@ 'target_name': 'pdfviewer_lib', 'type': 'static_library', 'sources': [ + # FIXME: Include directory is named "inc" (instead of "include") in + # order to not be considered the public API. + '../experimental/PdfViewer/inc/SkPdfRenderer.h', + '../experimental/PdfViewer/src/SkPdfRenderer.cpp', + '../experimental/PdfViewer/SkPdfGraphicsState.cpp', '../experimental/PdfViewer/SkPdfFont.cpp', - '../experimental/PdfViewer/SkPdfRenderer.cpp', '../experimental/PdfViewer/SkPdfReporter.cpp', '../experimental/PdfViewer/SkPdfUtils.cpp', #'../experimental/PdfViewer/SkPdfNYI.cpp', @@ -25,6 +29,7 @@ ], 'include_dirs': [ '../experimental/PdfViewer', + '../experimental/PdfViewer/inc', '../experimental/PdfViewer/pdfparser', '../experimental/PdfViewer/pdfparser/native', '../experimental/PdfViewer/pdfparser/native/pdfapi', |