diff options
author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:37:29 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:37:29 +0000 |
commit | 598e4f866fb1540d4d5e4351694bb3c9b0a20a1b (patch) | |
tree | df1a98aa62ccff7ffacacfa4c961d2ee74e6bf2f /printing | |
parent | 93773d08322990032231aa26c4eba4f02014de99 (diff) | |
download | chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.zip chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.tar.gz chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.tar.bz2 |
Skia is going to Split the SkDevice class into SkBaseDevice and SkBitmapDevice. Right now Skia has typedefs redirecting SkBaseDevice and SkBitmapDevice to SkDevice. This CL begins the Chromium-side renaming process in preparation for the real change (https://codereview.chromium.org/22978012/)
BUG=278148
Review URL: https://chromiumcodereview.appspot.com/22796028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r-- | printing/emf_win.cc | 2 | ||||
-rw-r--r-- | printing/emf_win.h | 2 | ||||
-rw-r--r-- | printing/metafile.h | 3 | ||||
-rw-r--r-- | printing/pdf_metafile_cg_mac.cc | 2 | ||||
-rw-r--r-- | printing/pdf_metafile_cg_mac.h | 2 | ||||
-rw-r--r-- | printing/pdf_metafile_skia.cc | 2 | ||||
-rw-r--r-- | printing/pdf_metafile_skia.h | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 98c8f8f..3003a2f 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -517,7 +517,7 @@ bool Emf::Record::SafePlayback(Emf::EnumerationContext* context) const { return res; } -SkDevice* Emf::StartPageForVectorCanvas( +SkBaseDevice* Emf::StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) { if (!StartPage(page_size, content_area, scale_factor)) diff --git a/printing/emf_win.h b/printing/emf_win.h index 3516f4e..fa27409 100644 --- a/printing/emf_win.h +++ b/printing/emf_win.h @@ -54,7 +54,7 @@ class PRINTING_EXPORT Emf : public Metafile { virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size) OVERRIDE; - virtual SkDevice* StartPageForVectorCanvas( + virtual SkBaseDevice* StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) OVERRIDE; // Inserts a custom GDICOMMENT records indicating StartPage/EndPage calls diff --git a/printing/metafile.h b/printing/metafile.h index e331069..b5454ff 100644 --- a/printing/metafile.h +++ b/printing/metafile.h @@ -28,6 +28,7 @@ class Size; } class SkDevice; +typedef SkDevice SkBaseDevice; #if defined(OS_CHROMEOS) || defined(OS_ANDROID) namespace base { @@ -87,7 +88,7 @@ class PRINTING_EXPORT Metafile { // This method calls StartPage and then returns an appropriate // VectorPlatformDevice implementation bound to the context created by // StartPage or NULL on error. - virtual SkDevice* StartPageForVectorCanvas( + virtual SkBaseDevice* StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) = 0; diff --git a/printing/pdf_metafile_cg_mac.cc b/printing/pdf_metafile_cg_mac.cc index cd7c5c7e..8668738 100644 --- a/printing/pdf_metafile_cg_mac.cc +++ b/printing/pdf_metafile_cg_mac.cc @@ -110,7 +110,7 @@ bool PdfMetafileCg::InitFromData(const void* src_buffer, return true; } -SkDevice* PdfMetafileCg::StartPageForVectorCanvas( +SkBaseDevice* PdfMetafileCg::StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) { NOTIMPLEMENTED(); diff --git a/printing/pdf_metafile_cg_mac.h b/printing/pdf_metafile_cg_mac.h index 77f7031..331129a 100644 --- a/printing/pdf_metafile_cg_mac.h +++ b/printing/pdf_metafile_cg_mac.h @@ -37,7 +37,7 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile { uint32 src_buffer_size) OVERRIDE; // Not implemented on mac. - virtual SkDevice* StartPageForVectorCanvas( + virtual SkBaseDevice* StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) OVERRIDE; virtual bool StartPage(const gfx::Size& page_size, diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index 31c8c74..2242cfc 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -48,7 +48,7 @@ bool PdfMetafileSkia::InitFromData(const void* src_buffer, return data_->pdf_stream_.write(src_buffer, src_buffer_size); } -SkDevice* PdfMetafileSkia::StartPageForVectorCanvas( +SkBaseDevice* PdfMetafileSkia::StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) { DCHECK(!page_outstanding_); diff --git a/printing/pdf_metafile_skia.h b/printing/pdf_metafile_skia.h index c6f1971..b44133f 100644 --- a/printing/pdf_metafile_skia.h +++ b/printing/pdf_metafile_skia.h @@ -30,7 +30,7 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile { virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size) OVERRIDE; - virtual SkDevice* StartPageForVectorCanvas( + virtual SkBaseDevice* StartPageForVectorCanvas( const gfx::Size& page_size, const gfx::Rect& content_area, const float& scale_factor) OVERRIDE; |