aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-11 18:34:35 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-11 18:34:35 +0000
commitcae54f1f211e3c293ef9afb968067d06ca0ea23d (patch)
tree070f978ada92f164c6c6b06c733690b5e51abc4c /gm
parentc4b21e6c03a6cdb03e116b9f510eb10cf8daedb1 (diff)
remove picture-backed surfaces
BUG=skia: R=robertphillips@google.com, mtklein@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/233943002 git-svn-id: http://skia.googlecode.com/svn/trunk@14159 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
-rw-r--r--gm/image.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/gm/image.cpp b/gm/image.cpp
index f5f5228c61..88c1db523e 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -153,11 +153,12 @@ protected:
static const char* kLabel8 = "Pre-Alloc Img";
static const char* kLabel9 = "New Alloc Img";
- static const char* kLabel10 = "SkPicture";
- static const char* kLabel11 = "Null Paint";
- static const char* kLabel12 = "GPU";
+ static const char* kLabel10 = "Null Paint";
+ static const char* kLabel11 = "GPU";
SkPaint textPaint;
+ textPaint.setAntiAlias(true);
+ textPaint.setTextSize(8);
canvas->drawText(kLabel1, strlen(kLabel1), 10, 60, textPaint);
canvas->drawText(kLabel2, strlen(kLabel2), 10, 140, textPaint);
@@ -171,7 +172,6 @@ protected:
canvas->drawText(kLabel9, strlen(kLabel9), 160, 10, textPaint);
canvas->drawText(kLabel10, strlen(kLabel10), 250, 10, textPaint);
canvas->drawText(kLabel11, strlen(kLabel11), 320, 10, textPaint);
- canvas->drawText(kLabel12, strlen(kLabel12), 410, 10, textPaint);
canvas->translate(80, 20);
@@ -181,8 +181,6 @@ protected:
SkImageInfo info = SkImageInfo::MakeN32Premul(W, H);
SkAutoTUnref<SkSurface> surf0(SkSurface::NewRasterDirect(info, fBuffer, RB));
SkAutoTUnref<SkSurface> surf1(SkSurface::NewRaster(info));
- SkAutoTUnref<SkSurface> surf2(SkSurface::NewPicture(info.fWidth, info.fHeight));
- SkAutoTUnref<SkSurface> surf3(SkSurface::NewPicture(info.fWidth, info.fHeight));
#if SK_SUPPORT_GPU
GrContext* ctx = canvas->getGrContext();
@@ -192,10 +190,6 @@ protected:
test_surface(canvas, surf0, true);
canvas->translate(80, 0);
test_surface(canvas, surf1, true);
- canvas->translate(80, 0);
- test_surface(canvas, surf2, true);
- canvas->translate(80, 0);
- test_surface(canvas, surf3, false);
#if SK_SUPPORT_GPU
if (NULL != ctx) {
canvas->translate(80, 0);