diff options
| author | tomhudson <tomhudson@google.com> | 2016-01-28 06:14:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 14:15:18 +0000 |
| commit | ed673bebe493d773cd858a00bcc609db9bc93079 (patch) | |
| tree | d780e2e7bc035f68b65cd4001fd6869dc90a60fb /printing | |
| parent | cd77a9c86c77724b967b611f9554c5a52d27ebf0 (diff) | |
| download | chromium_src-ed673bebe493d773cd858a00bcc609db9bc93079.zip chromium_src-ed673bebe493d773cd858a00bcc609db9bc93079.tar.gz chromium_src-ed673bebe493d773cd858a00bcc609db9bc93079.tar.bz2 | |
skia::PlatformCanvas is an alias for SkCanvas; this is unhelpful. It's quite common for functions to be declared as returning SkCanvas* but defined as returning skia::PlatformCanvas*, so it's also not future-proof.
R=fmalita@chromium.org,reed@chromium.org
TBR=danakj@chromium.org,piman@chromium.org,thestig@chromium.org
Review URL: https://codereview.chromium.org/1618703006
Cr-Commit-Position: refs/heads/master@{#372084}
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/pdf_metafile_skia.cc | 3 | ||||
| -rw-r--r-- | printing/pdf_metafile_skia.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index 04a8c40f..1a60b5b 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -15,6 +15,7 @@ #include "base/time/time.h" #include "printing/print_settings.h" #include "skia/ext/refptr.h" +#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkData.h" #include "third_party/skia/include/core/SkDocument.h" #include "third_party/skia/include/core/SkPictureRecorder.h" @@ -114,7 +115,7 @@ bool PdfMetafileSkia::StartPage(const gfx::Size& page_size, NULL, 0); } -skia::PlatformCanvas* PdfMetafileSkia::GetVectorCanvasForNewPage( +SkCanvas* PdfMetafileSkia::GetVectorCanvasForNewPage( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) { diff --git a/printing/pdf_metafile_skia.h b/printing/pdf_metafile_skia.h index cd92d618..aa5acd7 100644 --- a/printing/pdf_metafile_skia.h +++ b/printing/pdf_metafile_skia.h @@ -75,13 +75,13 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile { // This method calls StartPage and then returns an appropriate // PlatformCanvas implementation bound to the context created by - // StartPage or NULL on error. The skia::PlatformCanvas pointer that + // StartPage or NULL on error. The SkCanvas pointer that // is returned is owned by this PdfMetafileSkia object and does not // need to be ref()ed or unref()ed. The canvas will remain valid // until FinishPage() or FinishDocument() is called. - skia::PlatformCanvas* GetVectorCanvasForNewPage(const gfx::Size& page_size, - const gfx::Rect& content_area, - const float& scale_factor); + SkCanvas* GetVectorCanvasForNewPage(const gfx::Size& page_size, + const gfx::Rect& content_area, + const float& scale_factor); private: scoped_ptr<PdfMetafileSkiaData> data_; |