AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DM::SKPSrc::size() reports correct size.

Browse Source 
Also, DM::GPUSink and DM::RasterSink crop DM::Src::size() to 2048x2048.

Motivation:
  Improve PDF testing by printing the entire SKP.

Source: http://crrev.com/863243004

BUG=skia:3365

Committed: https://skia.googlesource.com/skia/+/441b10eac09a1f44983e35da827a6b438a409e63

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot

Review URL: https://codereview.chromium.org/863243005
This commit is contained in:
mtklein 2015-01-28 13:59:42 -08:00 committed by Commit bot
parent 40dab98de1
commit d4dd58e43c
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dm/DMSrcSink.cpp
View File

@ -4,6 +4,7 @@
#include "SkDocument.h"
#include "SkMultiPictureDraw.h"
#include "SkOSFile.h"
#include "SkPictureData.h"
#include "SkPictureRecorder.h"
#include "SkRandom.h"
#include "SkStream.h"
@ -101,8 +102,6 @@ Name ImageSrc::name() const {
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
static const SkRect kSKPViewport = {0,0, 1000,1000};
SKPSrc::SKPSrc(SkString path) : fPath(path) {}
Error SKPSrc::draw(SkCanvas* canvas) const {
@ -115,20 +114,35 @@ Error SKPSrc::draw(SkCanvas* canvas) const {
return SkStringPrintf("Couldn't decode %s as a picture.", fPath.c_str());
}
stream.reset((SkStream*)NULL); // Might as well drop this when we're done with it.
canvas->clipRect(kSKPViewport);
canvas->drawPicture(pic);
return "";
}
SkISize SKPSrc::size() const {
// This may be unnecessarily large.
return kSKPViewport.roundOut().size();
SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
SkPictInfo info;
if (!stream || !SkPicture::InternalOnly_StreamIsSKP(stream, &info)) {
return SkISize::Make(0,0);
}
return info.fCullRect.roundOut().size();
}
Name SKPSrc::name() const { return SkOSPath::Basename(fPath.c_str()); }
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
static SkISize limit_raster_dimensions(const SkISize& size) {
// Clamp both dimensions to 2K to stay within typical GPU maximum texture limits.
int width = SkTMin(2048, size.width()),
height = SkTMin(2048, size.height());
// Clamp our largest dimension until we're no more than 2.25 megapixels, to keep RAM usage sane.
int& largest = width > height ? width : height;
while (width * height > 2359296) {
largest /= 2;
}
return SkISize::Make(width, height);
}
GPUSink::GPUSink(GrContextFactory::GLContextType ct,
GrGLStandard api,
int samples,
@ -146,7 +160,7 @@ int GPUSink::enclave() const {
Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
GrContextFactory factory;
const SkISize size = src.size();
const SkISize size = limit_raster_dimensions(src.size());
const SkImageInfo info =
SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType);
SkAutoTUnref<SkSurface> surface(
@ -229,7 +243,7 @@ Error SKPSink::draw(const Src& src, SkBitmap*, SkWStream* dst) const {
RasterSink::RasterSink(SkColorType colorType) : fColorType(colorType) {}
Error RasterSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
const SkISize size = src.size();
const SkISize size = limit_raster_dimensions(src.size());
// If there's an appropriate alpha type for this color type, use it, otherwise use premul.
SkAlphaType alphaType = kPremul_SkAlphaType;
(void)SkColorTypeValidateAlphaType(fColorType, alphaType, &alphaType);

9
gm/gm.h
View File

@ -53,7 +53,14 @@ namespace skiagm {
void drawBackground(SkCanvas*);
void drawContent(SkCanvas*);
SkISize getISize() { return this->onISize(); }
SkISize getISize() {
SkISize size = this->onISize();
// Sanity cap on GM dimensions.
SkASSERT(size.width() * size.height() <= 2359296 && // 2.25 megapixels
size.width() <= 2048 && // Typical GPU max dimension.
size.height() <= 2048);
return size;
}
const char* getName();
virtual bool runAsBench() const { return false; }