From 88fd0fbcccea615f2d2cd61a121ac9e3185adfe4 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 1 Dec 2014 06:56:38 -0800 Subject: Bump min picture version. Chrome Stable is M39, which produces picture format v35: https://chromium.googlesource.com/skia/+/chrome/m39/include/core/SkPicture.h We don't need any code to deal with pictures older than v35. (When M40 goes stable, we can step up to v37, the current latest version.) BUG=skia: Review URL: https://codereview.chromium.org/770703002 --- tools/skpinfo.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'tools/skpinfo.cpp') diff --git a/tools/skpinfo.cpp b/tools/skpinfo.cpp index 55229650f3..c7fd8c8708 100644 --- a/tools/skpinfo.cpp +++ b/tools/skpinfo.cpp @@ -59,8 +59,8 @@ int tool_main(int argc, char** argv) { SkDebugf("Version: %d\n", info.fVersion); } if (FLAGS_cullRect && !FLAGS_quiet) { - SkDebugf("Cull Rect: %f,%f,%f,%f\n", - info.fCullRect.fLeft, info.fCullRect.fTop, + SkDebugf("Cull Rect: %f,%f,%f,%f\n", + info.fCullRect.fLeft, info.fCullRect.fTop, info.fCullRect.fRight, info.fCullRect.fBottom); } if (FLAGS_flags && !FLAGS_quiet) { @@ -106,15 +106,6 @@ int tool_main(int argc, char** argv) { if (FLAGS_tags && !FLAGS_quiet) { SkDebugf("SK_PICT_FACTORY_TAG %d\n", chunkSize); } - // Remove this code when v21 and below are no longer supported -#ifndef DISABLE_V21_COMPATIBILITY_CODE - if (info.fVersion < 22) { - if (!FLAGS_quiet) { - SkDebugf("Exiting early due to format limitations\n"); - } - return kSuccess; // TODO: need to store size in bytes - } -#endif break; case SK_PICT_TYPEFACE_TAG: if (FLAGS_tags && !FLAGS_quiet) { -- cgit v1.2.3