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

Unified Diff: include/core/SkBitmap.h

Issue 271693002: remove dead mipmap code from SkBitmap (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 7 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 | « gyp/skia_for_chromium_defines.gypi ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 45b6288b2ad0a90ed9d93e90db9a575352d9e00e..6ffe1bb6920f5c9999d0f71865c053388092b976 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -647,8 +647,10 @@ public:
*/
bool deepCopyTo(SkBitmap* dst) const;
+#ifdef SK_SUPPORT_LEGACY_BUILDMIPMAP
SK_ATTR_DEPRECATED("use setFilterLevel on SkPaint")
- void buildMipMap(bool forceRebuild = false);
+ void buildMipMap(bool forceRebuild = false) {}
+#endif
#ifdef SK_BUILD_FOR_ANDROID
bool hasHardwareMipMap() const {
@@ -750,9 +752,6 @@ public:
SK_TO_STRING_NONVIRT()
private:
- struct MipMap;
- mutable MipMap* fMipMap;
-
mutable SkPixelRef* fPixelRef;
mutable int fPixelLockCount;
// These are just caches from the locked pixelref
@@ -798,16 +797,6 @@ private:
void freePixels();
void updatePixelsFromRef() const;
- static SkFixed ComputeMipLevel(SkFixed sx, SkFixed dy);
-
- /** Given scale factors sx, sy, determine the miplevel available in the
- bitmap, and return it (this is the amount to shift matrix iterators
- by). If dst is not null, it is set to the correct level.
- */
- int extractMipLevel(SkBitmap* dst, SkFixed sx, SkFixed sy);
- bool hasMipMap() const;
- void freeMipMap();
-
friend struct SkBitmapProcState;
};
« no previous file with comments | « gyp/skia_for_chromium_defines.gypi ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698