diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-06 21:43:05 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-06 21:43:05 +0000 |
commit | 2ebc10dd12a6fe55fda37a9bd5b1e0c1c1e08232 (patch) | |
tree | aa813ad903bfbe78fc82c6e5d97d06111fecd119 /src/images/SkImageRef_ashmem.h | |
parent | 473f0aa2bb218e50fce5e19063f8c8fdaf57fad4 (diff) |
Revert "Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap."""
This reverts commit 5f035e90d6dea0139a4f204b634e7b7b3b4976d7.
Reverting because it breaks chrome/blink due to new SkPixelRef constructor arg.
BUG=
Review URL: https://codereview.chromium.org/108993002
git-svn-id: http://skia.googlecode.com/svn/trunk@12551 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkImageRef_ashmem.h')
-rw-r--r-- | src/images/SkImageRef_ashmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/images/SkImageRef_ashmem.h b/src/images/SkImageRef_ashmem.h index a2652fbc30..efee5e759b 100644 --- a/src/images/SkImageRef_ashmem.h +++ b/src/images/SkImageRef_ashmem.h @@ -19,7 +19,7 @@ struct SkAshmemRec { class SkImageRef_ashmem : public SkImageRef { public: - SkImageRef_ashmem(const SkImageInfo&, SkStreamRewindable*, int sampleSize = 1); + SkImageRef_ashmem(SkStreamRewindable*, SkBitmap::Config, int sampleSize = 1); virtual ~SkImageRef_ashmem(); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageRef_ashmem) |