diff options
author | fmalita <fmalita@chromium.org> | 2014-11-13 08:33:37 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-13 08:33:37 -0800 |
commit | 6987dcaf257dd7c2c8e0014cf7452fde82bcba5b (patch) | |
tree | 8cc55eaa1f21619124d5807528f5cb4d602701ac /src/utils/SkGatherPixelRefsAndRects.h | |
parent | 3b27adef0a52f6d321fdee7412ef69e7a7284bcc (diff) |
Rename onCreateDevice -> onCreateCompatibleDevice
This is a port of https://codereview.chromium.org/723743002/ with the
following changes:
* drop the legacy onCreateDevice variant completely
* also convert SkXPSDevice & SkGatherPixelRefsAndRects to the new API
This is expected to break canaries and will require a manual/cowboy
roll.
TBR=reed@google.com
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/720213002
Diffstat (limited to 'src/utils/SkGatherPixelRefsAndRects.h')
-rw-r--r-- | src/utils/SkGatherPixelRefsAndRects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h index 0a4bb5b84c..4eeb56c14c 100644 --- a/src/utils/SkGatherPixelRefsAndRects.h +++ b/src/utils/SkGatherPixelRefsAndRects.h @@ -302,11 +302,11 @@ private: NotSupported(); } - virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, Usage usage) SK_OVERRIDE { + virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& info) SK_OVERRIDE { // we expect to only get called via savelayer, in which case it is fine. - SkASSERT(kSaveLayer_Usage == usage); + SkASSERT(kSaveLayer_Usage == info.fUsage); return SkNEW_ARGS(SkGatherPixelRefsAndRectsDevice, - (info.width(), info.height(), fPRCont)); + (info.fInfo.width(), info.fInfo.height(), fPRCont)); } static void NotSupported() { |