Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: tools/android/SkBitmapRegionDecoder.cpp

Issue 1438873002: Move SkBitmapRegionDecoder to include/android and src/android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase (header guards) Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/android/SkBitmapRegionDecoder.h ('k') | tools/android/SkBitmapRegionDecoderPriv.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/SkBitmapRegionDecoder.cpp
diff --git a/tools/android/SkBitmapRegionDecoder.cpp b/tools/android/SkBitmapRegionDecoder.cpp
deleted file mode 100644
index 7dc05059e1b76255f307cda621bc02a5d3856584..0000000000000000000000000000000000000000
--- a/tools/android/SkBitmapRegionDecoder.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmapRegionCanvas.h"
-#include "SkBitmapRegionCodec.h"
-#include "SkBitmapRegionDecoder.h"
-#include "SkAndroidCodec.h"
-#include "SkCodec.h"
-#include "SkCodecPriv.h"
-#include "SkImageDecoder.h"
-
-SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create(
- SkData* data, Strategy strategy) {
- return SkBitmapRegionDecoder::Create(new SkMemoryStream(data),
- strategy);
-}
-
-SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create(
- SkStreamRewindable* stream, Strategy strategy) {
- SkAutoTDelete<SkStreamRewindable> streamDeleter(stream);
- switch (strategy) {
- case kCanvas_Strategy: {
- SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(streamDeleter.detach()));
- if (nullptr == codec) {
- SkCodecPrintf("Error: Failed to create decoder.\n");
- return nullptr;
- }
-
- if (SkEncodedFormat::kWEBP_SkEncodedFormat == codec->getEncodedFormat()) {
- // FIXME: Support webp using a special case. Webp does not support
- // scanline decoding.
- return nullptr;
- }
-
- switch (codec->getScanlineOrder()) {
- case SkCodec::kTopDown_SkScanlineOrder:
- case SkCodec::kNone_SkScanlineOrder:
- break;
- default:
- SkCodecPrintf("Error: Scanline ordering not supported.\n");
- return nullptr;
- }
- return new SkBitmapRegionCanvas(codec.detach());
- }
- case kAndroidCodec_Strategy: {
- SkAutoTDelete<SkAndroidCodec> codec =
- SkAndroidCodec::NewFromStream(streamDeleter.detach());
- if (NULL == codec) {
- SkCodecPrintf("Error: Failed to create codec.\n");
- return NULL;
- }
- return new SkBitmapRegionCodec(codec.detach());
- }
- default:
- SkASSERT(false);
- return nullptr;
- }
-}
« no previous file with comments | « tools/android/SkBitmapRegionDecoder.h ('k') | tools/android/SkBitmapRegionDecoderPriv.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698