a1193e4b0e
SkStream is a stateful object, so it does not make sense for it to have multiple owners. Make SkStream inherit directly from SkNoncopyable. Update methods which previously called SkStream::ref() (e.g. SkImageDecoder::buildTileIndex() and SkFrontBufferedStream::Create(), which required the existing owners to call SkStream::unref()) to take ownership of their SkStream parameters and delete when done (including on failure). Switch all SkAutoTUnref<SkStream>s to SkAutoTDelete<SkStream>s. In some cases this means heap allocating streams that were previously stack allocated. Respect ownership rules of SkTypeface::CreateFromStream() and SkImageDecoder::buildTileIndex(). Update the comments for exceptional methods which do not affect the ownership of their SkStream parameters (e.g. SkPicture::CreateFromStream() and SkTypeface::Deserialize()) to be explicit about ownership. Remove test_stream_life, which tested that buildTileIndex() behaved correctly when SkStream was a ref counted object. The test does not make sense now that it is not. In SkPDFStream, remove the SkMemoryStream member. Instead of using it, create a new SkMemoryStream to pass to fDataStream (which is now an SkAutoTDelete). Make other pdf rasterizers behave like SkPDFDocumentToBitmap. SkPDFDocumentToBitmap delete the SkStream, so do the same in the following pdf rasterizers: SkPopplerRasterizePDF SkNativeRasterizePDF SkNoRasterizePDF Requires a change to Android, which currently treats SkStreams as ref counted objects. Review URL: https://codereview.chromium.org/849103004
82 lines
2.3 KiB
C++
82 lines
2.3 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkPicture.h"
|
|
#include "SkRecordOpts.h"
|
|
#include "SkRecorder.h"
|
|
#include "SkStream.h"
|
|
|
|
#include "DumpRecord.h"
|
|
#include "LazyDecodeBitmap.h"
|
|
|
|
DEFINE_string2(skps, r, "", ".SKPs to dump.");
|
|
DEFINE_string(match, "", "The usual filters on file names to dump.");
|
|
DEFINE_bool2(optimize, O, false, "Run SkRecordOptimize before dumping.");
|
|
DEFINE_int32(tile, 1000000000, "Simulated tile size.");
|
|
DEFINE_bool(timeWithCommand, false, "If true, print time next to command, else in first column.");
|
|
|
|
static void dump(const char* name, int w, int h, const SkRecord& record) {
|
|
SkBitmap bitmap;
|
|
bitmap.allocN32Pixels(w, h);
|
|
SkCanvas canvas(bitmap);
|
|
canvas.clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile),
|
|
SkIntToScalar(FLAGS_tile)));
|
|
|
|
printf("%s %s\n", FLAGS_optimize ? "optimized" : "not-optimized", name);
|
|
|
|
DumpRecord(record, &canvas, FLAGS_timeWithCommand);
|
|
}
|
|
|
|
|
|
int tool_main(int argc, char** argv);
|
|
int tool_main(int argc, char** argv) {
|
|
SkCommandLineFlags::Parse(argc, argv);
|
|
SkAutoGraphics ag;
|
|
|
|
for (int i = 0; i < FLAGS_skps.count(); i++) {
|
|
if (SkCommandLineFlags::ShouldSkip(FLAGS_match, FLAGS_skps[i])) {
|
|
continue;
|
|
}
|
|
|
|
SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(FLAGS_skps[i]));
|
|
if (!stream) {
|
|
SkDebugf("Could not read %s.\n", FLAGS_skps[i]);
|
|
exit(1);
|
|
}
|
|
SkAutoTUnref<SkPicture> src(
|
|
SkPicture::CreateFromStream(stream, sk_tools::LazyDecodeBitmap));
|
|
if (!src) {
|
|
SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]);
|
|
exit(1);
|
|
}
|
|
const int w = SkScalarCeilToInt(src->cullRect().width());
|
|
const int h = SkScalarCeilToInt(src->cullRect().height());
|
|
|
|
SkRecord record;
|
|
SkRecorder canvas(&record, w, h);
|
|
src->playback(&canvas);
|
|
|
|
if (FLAGS_optimize) {
|
|
SkRecordOptimize(&record);
|
|
}
|
|
|
|
dump(FLAGS_skps[i], w, h, record);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if !defined SK_BUILD_FOR_IOS
|
|
int main(int argc, char * const argv[]) {
|
|
return tool_main(argc, (char**) argv);
|
|
}
|
|
#endif
|