diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-07 19:34:38 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-07 19:34:38 +0000 |
| commit | e3beb6bd7de7fa211681abbb0be58e80b19885e0 (patch) | |
| tree | 0e5a9079910a9f42053b6518f9ba802a258ed46d /experimental/PdfViewer | |
| parent | c4df655b37aea7097d3007b299de582ba517ef16 (diff) | |
SkNonCopyable should be used with private inheritance.
This is mostly s/public SkNoncopyable/SkNoncopyable/g.
Two classes (SkDrawLooper::Context and SkPicture::OperationList) don't actually work with SkNoncopyable because they introduce a virtual destructor. I added SkNoncopyableVirtual to make them work as intended. Sort of questionable whether they really need to be noncopyable in the first place, but I guess it doesn't hurt to keep the behavior the same.
BUG=skia:
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/226183018
git-svn-id: http://skia.googlecode.com/svn/trunk@14081 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/PdfViewer')
| -rw-r--r-- | experimental/PdfViewer/inc/SkPdfContext.h | 2 | ||||
| -rw-r--r-- | experimental/PdfViewer/inc/SkPdfRenderer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/experimental/PdfViewer/inc/SkPdfContext.h b/experimental/PdfViewer/inc/SkPdfContext.h index a547fd6c30..cd6eba2209 100644 --- a/experimental/PdfViewer/inc/SkPdfContext.h +++ b/experimental/PdfViewer/inc/SkPdfContext.h @@ -22,7 +22,7 @@ class SkPdfNativeObject; * The context of the drawing. The document we draw from, the current stack of * objects, ... */ -class SkPdfContext : public SkNoncopyable { +class SkPdfContext : SkNoncopyable { public: // FIXME (scroggo): Add functions for accessing these. SkTDStackNester<SkPdfNativeObject*> fObjectStack; diff --git a/experimental/PdfViewer/inc/SkPdfRenderer.h b/experimental/PdfViewer/inc/SkPdfRenderer.h index c978a739ec..9fc1ff7c6b 100644 --- a/experimental/PdfViewer/inc/SkPdfRenderer.h +++ b/experimental/PdfViewer/inc/SkPdfRenderer.h @@ -29,7 +29,7 @@ enum SkPdfContent { * The SkPdfRenderer class is used to render a PDF into canvas. * */ -class SkPdfRenderer : public SkNoncopyable { +class SkPdfRenderer : SkNoncopyable { public: // Create a new renderer from a stream. // TODO(edisonn): replace it with a SkSmartStream which would know to to efficiently |