fix labels on image-surface gm

gm/image.cpp

 /*
  * 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 "gm.h"
 #include "SkSurface.h"
 #include "SkCanvas.h"
@@ skipping 102 matching lines @@
     ImageGM() {
         fBufferSize = RB * H;
         fBuffer = sk_malloc_throw(fBufferSize);
         fSize.set(SkIntToScalar(W), SkIntToScalar(H));
     }
 
     virtual ~ImageGM() {
         sk_free(fBuffer);
     }
 
-
 protected:
-    virtual SkString onShortName() {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("image-surface");
     }
 
-    virtual SkISize onISize() {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(960, 1200);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         drawJpeg(canvas, this->getISize());
 
         canvas->scale(2, 2);
 
         static const char* kLabel1 = "Original Img";
         static const char* kLabel2 = "Modified Img";
         static const char* kLabel3 = "Cur Surface";
         static const char* kLabel4 = "Full Crop";
         static const char* kLabel5 = "Over-crop";
         static const char* kLabel6 = "Upper-left";
         static const char* kLabel7 = "No Crop";
 
         static const char* kLabel8 = "Pre-Alloc Img";
         static const char* kLabel9 = "New Alloc Img";
-        static const char* kLabel10 = "Null Paint";
-        static const char* kLabel11 = "GPU";
+        static const char* kLabel10 = "GPU";
 
         SkPaint textPaint;
         textPaint.setAntiAlias(true);
         sk_tool_utils::set_portable_typeface(&textPaint);
         textPaint.setTextSize(8);
 
         canvas->drawText(kLabel1, strlen(kLabel1), 10,  60, textPaint);
         canvas->drawText(kLabel2, strlen(kLabel2), 10, 140, textPaint);
         canvas->drawText(kLabel3, strlen(kLabel3), 10, 220, textPaint);
         canvas->drawText(kLabel4, strlen(kLabel4), 10, 300, textPaint);
         canvas->drawText(kLabel5, strlen(kLabel5), 10, 380, textPaint);
         canvas->drawText(kLabel6, strlen(kLabel6), 10, 460, textPaint);
         canvas->drawText(kLabel7, strlen(kLabel7), 10, 540, textPaint);
 
         canvas->drawText(kLabel8, strlen(kLabel8),  80, 10, textPaint);
         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(kLabel10, strlen(kLabel10), 265, 10, textPaint);
 
         canvas->translate(80, 20);
 
         // since we draw into this directly, we need to start fresh
         sk_bzero(fBuffer, fBufferSize);
 
         SkImageInfo info = SkImageInfo::MakeN32Premul(W, H);
         SkAutoTUnref<SkSurface> surf0(SkSurface::NewRasterDirect(info, fBuffer, RB));
         SkAutoTUnref<SkSurface> surf1(SkSurface::NewRaster(info));
+        SkAutoTUnref<SkSurface> surf2;  // gpu
+
 #if SK_SUPPORT_GPU
-        GrContext* ctx = canvas->getGrContext();
-
-        SkAutoTUnref<SkSurface> surf4(SkSurface::NewRenderTarget(
-            ctx, SkSurface::kNo_Budgeted, info));
+        surf2.reset(SkSurface::NewRenderTarget(canvas->getGrContext(),
+                                               SkSurface::kNo_Budgeted, info));
 #endif
 
         test_surface(canvas, surf0, true);
         canvas->translate(80, 0);
         test_surface(canvas, surf1, true);
-#if SK_SUPPORT_GPU
-        if (ctx) {
+        if (surf2) {
             canvas->translate(80, 0);
-            test_surface(canvas, surf4, true);
+            test_surface(canvas, surf2, true);
         }
-#endif
     }
 
     uint32_t onGetFlags() const SK_OVERRIDE {
         return GM::kSkipPicture_Flag | GM::kSkipPipe_Flag;
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
+DEF_GM( return new ImageGM; )
 
-//////////////////////////////////////////////////////////////////////////////
-
-static skiagm::GM* MyFactory(void*) { return new ImageGM; }
-static skiagm::GMRegistry reg(MyFactory);