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

Start on some unwritten SkRecord TODOs:

Browse Source 
- add SK_OVERRIDE for SkCanvas methods in SkRecorder
  - start on unit tests, here just for SkRecord itself

BUG=skia:2378
R=fmalita@google.com, mtklein@google.com, fmalita@chromium.org

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/228723003

git-svn-id: http://skia.googlecode.com/svn/trunk@14097 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-04-08 17:31:08 +00:00
parent 6719d60485
commit 066a28d2c1
3 changed files with 118 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/tests.gypi
View File

@ -9,6 +9,7 @@
'../src/pathops',
'../src/pdf',
'../src/pipe/utils',
'../src/record',
'../src/utils',
'../src/utils/debugger',
'../tools/',
@ -134,6 +135,7 @@
'../tests/ReadPixelsTest.cpp',
'../tests/ReadWriteAlphaTest.cpp',
'../tests/Reader32Test.cpp',
'../tests/RecordTest.cpp',
'../tests/RefCntTest.cpp',
'../tests/RefDictTest.cpp',
'../tests/RegionTest.cpp',

108
src/record/SkRecorder.h
View File

@ -12,53 +12,81 @@ public:
// Does not take ownership of the SkRecord.
SkRecorder(SkRecord*, int width, int height);
void clear(SkColor);
void drawPaint(const SkPaint& paint);
void drawPoints(PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint);
void drawRect(const SkRect& rect, const SkPaint& paint);
void drawOval(const SkRect& oval, const SkPaint&);
void drawRRect(const SkRRect& rrect, const SkPaint& paint);
void drawPath(const SkPath& path, const SkPaint& paint);
void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
const SkPaint* paint = NULL);
void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
void clear(SkColor) SK_OVERRIDE;
void drawPaint(const SkPaint& paint) SK_OVERRIDE;
void drawPoints(PointMode mode,
size_t count,
const SkPoint pts[],
const SkPaint& paint) SK_OVERRIDE;
void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
void drawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE;
void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
void drawBitmap(const SkBitmap& bitmap,
SkScalar left,
SkScalar top,
const SkPaint* paint = NULL) SK_OVERRIDE;
void drawBitmapRectToRect(const SkBitmap& bitmap,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint = NULL,
DrawBitmapRectFlags flags = kNone_DrawBitmapRectFlag);
void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, const SkPaint* paint = NULL);
void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
const SkPaint* paint = NULL);
void drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint = NULL);
void drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
const SkPaint& paint);
void drawPosText(const void* text, size_t byteLength, const SkPoint pos[],
const SkPaint& paint);
void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY,
const SkPaint& paint);
void drawTextOnPath(const void* text, size_t byteLength,
const SkPath& path, const SkMatrix* matrix, const SkPaint& paint);
void drawPicture(SkPicture& picture);
DrawBitmapRectFlags flags = kNone_DrawBitmapRectFlag) SK_OVERRIDE;
void drawBitmapMatrix(const SkBitmap& bitmap,
const SkMatrix& m,
const SkPaint* paint = NULL) SK_OVERRIDE;
void drawBitmapNine(const SkBitmap& bitmap,
const SkIRect& center,
const SkRect& dst,
const SkPaint* paint = NULL) SK_OVERRIDE;
void drawSprite(const SkBitmap& bitmap,
int left,
int top,
const SkPaint* paint = NULL) SK_OVERRIDE;
void drawText(const void* text,
size_t byteLength,
SkScalar x,
SkScalar y,
const SkPaint& paint) SK_OVERRIDE;
void drawPosText(const void* text,
size_t byteLength,
const SkPoint pos[],
const SkPaint& paint) SK_OVERRIDE;
void drawPosTextH(const void* text,
size_t byteLength,
const SkScalar xpos[],
SkScalar constY,
const SkPaint& paint) SK_OVERRIDE;
void drawTextOnPath(const void* text,
size_t byteLength,
const SkPath& path,
const SkMatrix* matrix,
const SkPaint& paint) SK_OVERRIDE;
void drawPicture(SkPicture& picture) SK_OVERRIDE;
void drawVertices(VertexMode vmode,
int vertexCount, const SkPoint vertices[],
const SkPoint texs[], const SkColor colors[],
int vertexCount,
const SkPoint vertices[],
const SkPoint texs[],
const SkColor colors[],
SkXfermode* xmode,
const uint16_t indices[], int indexCount,
const SkPaint& paint);
const uint16_t indices[],
int indexCount,
const SkPaint& paint) SK_OVERRIDE;
void willSave(SkCanvas::SaveFlags);
SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags);
void willRestore();
void willSave(SkCanvas::SaveFlags) SK_OVERRIDE;
SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags) SK_OVERRIDE;
void willRestore() SK_OVERRIDE;
void didConcat(const SkMatrix&);
void didSetMatrix(const SkMatrix&);
void didConcat(const SkMatrix&) SK_OVERRIDE;
void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&);
void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle);
void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle);
void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle);
void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op);
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE;
void onPushCull(const SkRect& cullRect);
void onPopCull();
void onPushCull(const SkRect& cullRect) SK_OVERRIDE;
void onPopCull() SK_OVERRIDE;
private:
template <typename T>

48
tests/RecordTest.cpp Normal file
View File

@ -0,0 +1,48 @@
#include "Test.h"
#include "SkRecord.h"
#include "SkRecords.h"
// Adds the area of any DrawRect command it sees into area.
class AreaSummer {
public:
explicit AreaSummer(int* area) : fArea(area) {}
template <typename T> void operator()(const T&) { }
private:
int* fArea;
};
template <> void AreaSummer::operator()(const SkRecords::DrawRect& record) {
*fArea += (int) (record.rect.width() * record.rect.height());
}
// Scales out the bottom-right corner of any DrawRect command it sees by 2x.
struct Stretch {
template <typename T> void operator()(T*) {}
};
template <> void Stretch::operator()(SkRecords::DrawRect* record) {
record->rect.fRight *= 2;
record->rect.fBottom *= 2;
}
// Basic tests for the low-level SkRecord code.
DEF_TEST(Record, r) {
SkRecord record;
// Add a simple DrawRect command.
SkRect rect = SkRect::MakeWH(10, 10);
SkPaint paint;
SkNEW_PLACEMENT_ARGS(record.append<SkRecords::DrawRect>(), SkRecords::DrawRect, (rect, paint));
// Its area should be 100.
int area = 0;
record.visit(AreaSummer(&area));
REPORTER_ASSERT(r, area == 100);
// Scale 2x. Now it's area should be 400.
record.mutate(Stretch());
area = 0;
record.visit(AreaSummer(&area));
REPORTER_ASSERT(r, area == 400);
}