diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 14:52:14 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 14:52:14 +0000 |
| commit | 6e332f768f873323b418ee7b028f28662bfb43c6 (patch) | |
| tree | db155655fdcea960b034f3bd1422118500480998 /include/core/SkPixelRef.h | |
| parent | bc2f1dc85e458af7bdb87873e60207f9f7299e4a (diff) | |
Revert of eliminate config param -- it was always self's config (https://codereview.chromium.org/246513002/)
Reason for revert:
Causes some layout_test failures around texture backed bitmaps. Test names and crash logs accessible via: https://storage.googleapis.com/chromium-layout-test-archives/linux_layout/13845/layout-test-results/results.html
Original issue's description:
> eliminate config param -- it was always self's config
>
> BUG=skia:
> R=bsalomon@google.com
>
> Committed: https://code.google.com/p/skia/source/detail?r=14303
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/249373003
git-svn-id: http://skia.googlecode.com/svn/trunk@14324 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkPixelRef.h')
| -rw-r--r-- | include/core/SkPixelRef.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index 579ca5b7e8..8319ec6da5 100644 --- a/include/core/SkPixelRef.h +++ b/include/core/SkPixelRef.h @@ -223,13 +223,14 @@ public: /** * Makes a deep copy of this PixelRef, respecting the requested config. + * @param config Desired config. * @param subset Subset of this PixelRef to copy. Must be fully contained within the bounds of * of this PixelRef. * @return A new SkPixelRef, or NULL if either there is an error (e.g. the destination could * not be created with the given config), or this PixelRef does not support deep * copies. */ - virtual SkPixelRef* deepCopy(const SkIRect* subset = NULL) { + virtual SkPixelRef* deepCopy(SkBitmap::Config config, const SkIRect* subset = NULL) { return NULL; } |