f8d7d27313
The new pixel ref behaves similarly to SkImageRef, with some key differences: It does not depend on the images project. It requires an SkImageCache, which handles allocation and caching of the pixel memory. It takes a function signature for decoding which decodes into already allocated pixel memory rather than into an SkBitmap. Add two implementations of SkImageCache: SkLruImageCache and SkAshmemImageCache. Replace SkSerializationHelpers::DecodeBitmap with SkPicture::InstallPixelRefProc, and update sites that referenced it. SkBitmapFactory now sets the pixel ref to a new object of the new class SkLazyPixelRef, provided it has an SkImageCache for caching. Provide an option to do lazy decodes in render_pictures and bench_pictures. SkPicture: Eliminate the default parameters in the constructor. If a proc for decoding bitmaps is installed, use it to decode any encoded data in subpictures. When parsing deserializing subpictures, check for success. When serializing subpictures, pass the picture's bitmap encoder to the subpicture's call to serialize. Update BitmapFactoryTest to test its new behavior. BUG=https://code.google.com/p/skia/issues/detail?id=1008 BUG=https://code.google.com/p/skia/issues/detail?id=1009 Review URL: https://codereview.appspot.com/7060052 git-svn-id: http://skia.googlecode.com/svn/trunk@7835 2bbb7eff-a529-9590-31e7-b0007b416f81
141 lines
3.8 KiB
C++
141 lines
3.8 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "SampleCode.h"
|
|
#include "SkDumpCanvas.h"
|
|
#include "SkView.h"
|
|
#include "SkCanvas.h"
|
|
#include "Sk64.h"
|
|
#include "SkGradientShader.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkImageDecoder.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkPath.h"
|
|
#include "SkPicture.h"
|
|
#include "SkRandom.h"
|
|
#include "SkRegion.h"
|
|
#include "SkShader.h"
|
|
#include "SkUtils.h"
|
|
#include "SkColorPriv.h"
|
|
#include "SkColorFilter.h"
|
|
#include "SkTime.h"
|
|
#include "SkTypeface.h"
|
|
#include "SkXfermode.h"
|
|
|
|
#include "SkStream.h"
|
|
#include "SkXMLParser.h"
|
|
|
|
class PictFileView : public SampleView {
|
|
SkString fFilename;
|
|
SkPicture* fPicture;
|
|
SkPicture* fBBoxPicture;
|
|
bool fUseBBox;
|
|
|
|
static SkPicture* LoadPicture(const char path[], bool useBBox) {
|
|
SkPicture* pic = NULL;
|
|
|
|
SkBitmap bm;
|
|
if (SkImageDecoder::DecodeFile(path, &bm)) {
|
|
bm.setImmutable();
|
|
pic = SkNEW(SkPicture);
|
|
SkCanvas* can = pic->beginRecording(bm.width(), bm.height());
|
|
can->drawBitmap(bm, 0, 0, NULL);
|
|
pic->endRecording();
|
|
} else {
|
|
SkFILEStream stream(path);
|
|
if (stream.isValid()) {
|
|
pic = SkNEW_ARGS(SkPicture, (&stream, NULL, &SkImageDecoder::DecodeMemory));
|
|
}
|
|
|
|
if (false) { // re-record
|
|
SkPicture p2;
|
|
pic->draw(p2.beginRecording(pic->width(), pic->height()));
|
|
p2.endRecording();
|
|
|
|
SkString path2(path);
|
|
path2.append(".new.skp");
|
|
SkFILEWStream writer(path2.c_str());
|
|
p2.serialize(&writer);
|
|
}
|
|
}
|
|
|
|
if (useBBox) {
|
|
SkPicture* bboxPicture = SkNEW(SkPicture);
|
|
pic->draw(bboxPicture->beginRecording(pic->width(), pic->height(),
|
|
SkPicture::kOptimizeForClippedPlayback_RecordingFlag));
|
|
bboxPicture->endRecording();
|
|
SkDELETE(pic);
|
|
return bboxPicture;
|
|
|
|
} else {
|
|
return pic;
|
|
}
|
|
}
|
|
|
|
public:
|
|
PictFileView(const char name[] = NULL) : fFilename(name) {
|
|
fPicture = NULL;
|
|
fBBoxPicture = NULL;
|
|
fUseBBox = false;
|
|
}
|
|
|
|
virtual ~PictFileView() {
|
|
SkSafeUnref(fPicture);
|
|
SkSafeUnref(fBBoxPicture);
|
|
}
|
|
|
|
protected:
|
|
// overrides from SkEventSink
|
|
virtual bool onQuery(SkEvent* evt) {
|
|
if (SampleCode::TitleQ(*evt)) {
|
|
SkString name("P:");
|
|
const char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR);
|
|
name.append(basename ? basename+1: fFilename.c_str());
|
|
if (fUseBBox) {
|
|
name.append(" <bbox>");
|
|
}
|
|
SampleCode::TitleR(evt, name.c_str());
|
|
return true;
|
|
}
|
|
return this->INHERITED::onQuery(evt);
|
|
}
|
|
|
|
virtual bool onEvent(const SkEvent& evt) {
|
|
if (evt.isType("PictFileView::toggleBBox")) {
|
|
fUseBBox = !fUseBBox;
|
|
return true;
|
|
}
|
|
return this->INHERITED::onEvent(evt);
|
|
}
|
|
|
|
virtual void onDrawContent(SkCanvas* canvas) {
|
|
SkPicture** picture = fUseBBox ? &fBBoxPicture : &fPicture;
|
|
|
|
if (!*picture) {
|
|
*picture = LoadPicture(fFilename.c_str(), fUseBBox);
|
|
}
|
|
if (*picture) {
|
|
canvas->drawPicture(**picture);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SampleView INHERITED;
|
|
};
|
|
|
|
SampleView* CreateSamplePictFileView(const char filename[]);
|
|
SampleView* CreateSamplePictFileView(const char filename[]) {
|
|
return new PictFileView(filename);
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
#if 0
|
|
static SkView* MyFactory() { return new PictFileView; }
|
|
static SkViewRegister reg(MyFactory);
|
|
#endif
|