commit 9a558d495dfe305a52946cdf97e8883190e0bbcc
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 30 15:06:24 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 30 15:06:24 2014 +0000
tree 8e3adabe8877f27fcc56b75fa295968bedb11f9f
parent ee982ed52b49543909fb08c81faa31c23483e864

using real tiles when simulating tiling

BUG=skia:
R=mtklein@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14993 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/bitmaprect.cpp

diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index e1034a9..8b29283 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -172,6 +172,8 @@
 // tile placement.
 class DrawBitmapRect4 : public skiagm::GM {
     bool fUseIRect;
+    SkBitmap fBigBitmap;
+
 public:
     DrawBitmapRect4(bool useIRect) : fUseIRect(useIRect) {
         this->setBGColor(0x88444444);
@@ -188,6 +190,10 @@
         return SkISize::Make(640, 480);
     }
 
+    virtual void onOnceBeforeDraw() SK_OVERRIDE {
+        make_big_bitmap(&fBigBitmap);
+    }
+
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkXfermode* mode = SkXfermode::Create(SkXfermode::kXor_Mode);
@@ -196,9 +202,6 @@
         paint.setAlpha(128);
         paint.setXfermode(mode)->unref();
 
-        SkBitmap bitmap;
-        make_big_bitmap(&bitmap);
-
         SkRect srcR1 = { 0.0f, 0.0f, 4096.0f, 2040.0f };
         SkRect dstR1 = { 10.1f, 10.1f, 629.9f, 400.9f };
 
@@ -206,16 +209,16 @@
         SkRect dstR2 = { 10, 410, 30, 430 };
 
         if (!fUseIRect) {
-            canvas->drawBitmapRectToRect(bitmap, &srcR1, dstR1, &paint);
-            canvas->drawBitmapRectToRect(bitmap, &srcR2, dstR2, &paint);
+            canvas->drawBitmapRectToRect(fBigBitmap, &srcR1, dstR1, &paint);
+            canvas->drawBitmapRectToRect(fBigBitmap, &srcR2, dstR2, &paint);
         } else {
             SkIRect iSrcR1, iSrcR2;
 
             srcR1.roundOut(&iSrcR1);
             srcR2.roundOut(&iSrcR2);
 
-            canvas->drawBitmapRect(bitmap, &iSrcR1, dstR1, &paint);
-            canvas->drawBitmapRect(bitmap, &iSrcR2, dstR2, &paint);
+            canvas->drawBitmapRect(fBigBitmap, &iSrcR1, dstR1, &paint);
+            canvas->drawBitmapRect(fBigBitmap, &iSrcR2, dstR2, &paint);
         }
     }
 

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 473220e..ad03fea 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -16,6 +16,7 @@
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
+#include "SkSurface.h"
 #include "SkTSort.h"
 #include "SkTime.h"
 #include "SkWindow.h"
@@ -1192,27 +1193,33 @@
     } else {
         SkSize tile = this->tileSize();
 
-        for (SkScalar y = 0; y < height(); y += tile.height()) {
-            for (SkScalar x = 0; x < width(); x += tile.width()) {
-                SkAutoCanvasRestore acr(canvas, true);
-                canvas->clipRect(SkRect::MakeXYWH(x, y,
-                                                  tile.width(),
-                                                  tile.height()));
-                this->INHERITED::draw(canvas);
-            }
-        }
+        if (kNo_Tiling == fTilingMode) {
+            this->INHERITED::draw(canvas); // no looping or surfaces needed
+        } else {
+            const int w = SkScalarRoundToInt(tile.width());
+            const int h = SkScalarRoundToInt(tile.height());
+            SkImageInfo info = SkImageInfo::MakeN32Premul(w, h);
+            SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
+            SkCanvas* tileCanvas = surface->getCanvas();
 
-        if (fTilingMode != kNo_Tiling) {
+            for (SkScalar y = 0; y < height(); y += tile.height()) {
+                for (SkScalar x = 0; x < width(); x += tile.width()) {
+                    SkAutoCanvasRestore acr(tileCanvas, true);
+                    tileCanvas->translate(-x, -y);
+                    tileCanvas->clear(0);
+                    this->INHERITED::draw(tileCanvas);
+                    surface->draw(canvas, x, y, NULL);
+                }
+            }
+
+            // for drawing the borders between tiles
             SkPaint paint;
             paint.setColor(0x60FF00FF);
             paint.setStyle(SkPaint::kStroke_Style);
 
             for (SkScalar y = 0; y < height(); y += tile.height()) {
                 for (SkScalar x = 0; x < width(); x += tile.width()) {
-                    canvas->drawRect(SkRect::MakeXYWH(x, y,
-                                                      tile.width(),
-                                                      tile.height()),
-                                     paint);
+                    canvas->drawRect(SkRect::MakeXYWH(x, y, tile.width(), tile.height()), paint);
                 }
             }
         }