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
117 lines
3.5 KiB
C++
117 lines
3.5 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 "SkBitmap.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkColor.h"
|
|
#include "SkFontDescriptor.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkPaint.h"
|
|
#include "SkPoint.h"
|
|
#include "SkRect.h"
|
|
#include "SkStream.h"
|
|
#include "SkTypeface.h"
|
|
#include "SkTypes.h"
|
|
#include "Test.h"
|
|
|
|
static const SkColor bgColor = SK_ColorWHITE;
|
|
|
|
static void create(SkBitmap* bm, SkIRect bound) {
|
|
bm->allocN32Pixels(bound.width(), bound.height());
|
|
}
|
|
|
|
static void drawBG(SkCanvas* canvas) {
|
|
canvas->drawColor(bgColor);
|
|
}
|
|
|
|
/** Assumes that the ref draw was completely inside ref canvas --
|
|
implies that everything outside is "bgColor".
|
|
Checks that all overlap is the same and that all non-overlap on the
|
|
ref is "bgColor".
|
|
*/
|
|
static bool compare(const SkBitmap& ref, const SkIRect& iref,
|
|
const SkBitmap& test, const SkIRect& itest)
|
|
{
|
|
const int xOff = itest.fLeft - iref.fLeft;
|
|
const int yOff = itest.fTop - iref.fTop;
|
|
|
|
SkAutoLockPixels alpRef(ref);
|
|
SkAutoLockPixels alpTest(test);
|
|
|
|
for (int y = 0; y < test.height(); ++y) {
|
|
for (int x = 0; x < test.width(); ++x) {
|
|
SkColor testColor = test.getColor(x, y);
|
|
int refX = x + xOff;
|
|
int refY = y + yOff;
|
|
SkColor refColor;
|
|
if (refX >= 0 && refX < ref.width() &&
|
|
refY >= 0 && refY < ref.height())
|
|
{
|
|
refColor = ref.getColor(refX, refY);
|
|
} else {
|
|
refColor = bgColor;
|
|
}
|
|
if (refColor != testColor) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
DEF_TEST(FontHostStream, reporter) {
|
|
{
|
|
SkPaint paint;
|
|
paint.setColor(SK_ColorGRAY);
|
|
paint.setTextSize(SkIntToScalar(30));
|
|
|
|
SkTypeface* fTypeface = SkTypeface::CreateFromName("Georgia",
|
|
SkTypeface::kNormal);
|
|
SkSafeUnref(paint.setTypeface(fTypeface));
|
|
|
|
SkIRect origRect = SkIRect::MakeWH(64, 64);
|
|
SkBitmap origBitmap;
|
|
create(&origBitmap, origRect);
|
|
SkCanvas origCanvas(origBitmap);
|
|
|
|
SkIRect streamRect = SkIRect::MakeWH(64, 64);
|
|
SkBitmap streamBitmap;
|
|
create(&streamBitmap, streamRect);
|
|
SkCanvas streamCanvas(streamBitmap);
|
|
|
|
SkPoint point = SkPoint::Make(24, 32);
|
|
|
|
// Test: origTypeface and streamTypeface from orig data draw the same
|
|
drawBG(&origCanvas);
|
|
origCanvas.drawText("A", 1, point.fX, point.fY, paint);
|
|
|
|
SkTypeface* origTypeface = paint.getTypeface();
|
|
SkAutoTUnref<SkTypeface> aur;
|
|
if (NULL == origTypeface) {
|
|
origTypeface = aur.reset(SkTypeface::RefDefault());
|
|
}
|
|
|
|
int ttcIndex;
|
|
SkAutoTDelete<SkStream> fontData(origTypeface->openStream(&ttcIndex));
|
|
SkTypeface* streamTypeface = SkTypeface::CreateFromStream(fontData.detach());
|
|
|
|
SkFontDescriptor desc;
|
|
bool isLocalStream = false;
|
|
streamTypeface->getFontDescriptor(&desc, &isLocalStream);
|
|
REPORTER_ASSERT(reporter, isLocalStream);
|
|
|
|
SkSafeUnref(paint.setTypeface(streamTypeface));
|
|
drawBG(&streamCanvas);
|
|
streamCanvas.drawPosText("A", 1, &point, paint);
|
|
|
|
REPORTER_ASSERT(reporter,
|
|
compare(origBitmap, origRect, streamBitmap, streamRect));
|
|
}
|
|
//Make sure the typeface is deleted and removed.
|
|
SkGraphics::PurgeFontCache();
|
|
}
|