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

Unified Diff: src/codec/SkCodec_libico.h

Issue 1022843005: Revert of Enabling ico decoding with use of png and bmp decoders (Closed) Base URL: https://skia.googlesource.com/skia.git@swizzle
Patch Set: Created 5 years, 9 months 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 | « src/codec/SkCodec_libbmp.cpp ('k') | src/codec/SkCodec_libico.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codec/SkCodec_libico.h
diff --git a/src/codec/SkCodec_libico.h b/src/codec/SkCodec_libico.h
deleted file mode 100644
index 778bcd2c544c966b46d48a7031692cdf3291e1eb..0000000000000000000000000000000000000000
--- a/src/codec/SkCodec_libico.h
+++ /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 "SkCodec.h"
-#include "SkImageInfo.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-
-/*
- * This class implements the decoding for bmp images
- */
-class SkIcoCodec : public SkCodec {
-public:
-
- /*
- * Checks the start of the stream to see if the image is a Ico or Cur
- */
- static bool IsIco(SkStream*);
-
- /*
- * Assumes IsIco was called and returned true
- * Creates an Ico decoder
- * Reads enough of the stream to determine the image format
- */
- static SkCodec* NewFromStream(SkStream*);
-
-protected:
-
- /*
- * Chooses the best dimensions given the desired scale
- */
- SkISize onGetScaledDimensions(float desiredScale) const SK_OVERRIDE;
-
- /*
- * Initiates the Ico decode
- */
- Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
- size_t dstRowBytes, const Options&, SkPMColor*, int*)
- SK_OVERRIDE;
-
- SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE {
- return kICO_SkEncodedFormat;
- }
-
-private:
-
- /*
- * Constructor called by NewFromStream
- * @param embeddedCodecs codecs for the embedded images, takes ownership
- */
- SkIcoCodec(const SkImageInfo& srcInfo,
- SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs);
-
- SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>>
- fEmbeddedCodecs; // owned
-
- typedef SkCodec INHERITED;
-};
« no previous file with comments | « src/codec/SkCodec_libbmp.cpp ('k') | src/codec/SkCodec_libico.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698