diff options
author | 2013-12-06 21:43:05 +0000 | |
---|---|---|
committer | 2013-12-06 21:43:05 +0000 | |
commit | 2ebc10dd12a6fe55fda37a9bd5b1e0c1c1e08232 (patch) | |
tree | aa813ad903bfbe78fc82c6e5d97d06111fecd119 /src/gpu/SkGr.cpp | |
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/gpu/SkGr.cpp')
-rw-r--r-- | src/gpu/SkGr.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index b55256e78e..c7ae0c8f36 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -258,33 +258,3 @@ GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) { return kUnknown_GrPixelConfig; } } - -bool GrPixelConfig2ColorType(GrPixelConfig config, SkColorType* ctOut) { - SkColorType ct; - switch (config) { - case kAlpha_8_GrPixelConfig: - ct = kAlpha_8_SkColorType; - break; - case kIndex_8_GrPixelConfig: - ct = kIndex8_SkColorType; - break; - case kRGB_565_GrPixelConfig: - ct = kRGB_565_SkColorType; - break; - case kRGBA_4444_GrPixelConfig: - ct = kARGB_4444_SkColorType; - break; - case kRGBA_8888_GrPixelConfig: - ct = kRGBA_8888_SkColorType; - break; - case kBGRA_8888_GrPixelConfig: - ct = kBGRA_8888_SkColorType; - break; - default: - return false; - } - if (ctOut) { - *ctOut = ct; - } - return true; -} |