alternate textblobgeometrychange fix... just make our own surface if needed

gm/textblobgeometrychange.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkCanvas.h"
@@ skipping 29 matching lines @@
 
         sk_tool_utils::add_to_text_blob(&builder, text, paint, 10, 10);
 
         SkAutoTUnref<const SkTextBlob> blob(builder.build());
 
         SkImageInfo info = SkImageInfo::MakeN32Premul(200, 200, canvas->imageInfo().profileType());
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         uint32_t allowSRGBInputs = canvas->getProps(&canvasProps)
             ? canvasProps.flags() & SkSurfaceProps::kAllowSRGBInputs_Flag : 0;
         SkSurfaceProps props(allowSRGBInputs, kUnknown_SkPixelGeometry);
-        auto surface(canvas->makeSurface(info, &props));
-        if (surface) {
-            SkCanvas* c = surface->getCanvas();
+        auto surface = canvas->makeSurface(info, &props);
+        if (!surface) {
+            surface = SkSurface::MakeRaster(info, &props);
+        }
+        SkCanvas* c = surface->getCanvas();
 
-            // LCD text on white background
-            SkRect rect = SkRect::MakeLTRB(0.f, 0.f, SkIntToScalar(kWidth), kHeight / 2.f);
-            SkPaint rectPaint;
-            rectPaint.setColor(0xffffffff);
-            canvas->drawRect(rect, rectPaint);
-            canvas->drawTextBlob(blob.get(), 10, 50, paint);
+        // LCD text on white background
+        SkRect rect = SkRect::MakeLTRB(0.f, 0.f, SkIntToScalar(kWidth), kHeight / 2.f);
+        SkPaint rectPaint;
+        rectPaint.setColor(0xffffffff);
+        canvas->drawRect(rect, rectPaint);
+        canvas->drawTextBlob(blob.get(), 10, 50, paint);
 
-            // This should not look garbled since we should disable LCD text in this case
-            // (i.e., unknown pixel geometry)
-            c->clear(0x00ffffff);
-            c->drawTextBlob(blob.get(), 10, 150, paint);
-            surface->draw(canvas, 0, 0, nullptr);
-        } else {
-            const char* text = "This test requires a surface";
-            size_t len = strlen(text);
-            SkPaint paint;
-            canvas->drawText(text, len, 10, 100, paint);
-        }
+        // This should not look garbled since we should disable LCD text in this case
+        // (i.e., unknown pixel geometry)
+        c->clear(0x00ffffff);
+        c->drawTextBlob(blob.get(), 10, 150, paint);
+        surface->draw(canvas, 0, 0, nullptr);
     }
 
 private:
     static const int kWidth = 200;
     static const int kHeight = 200;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new TextBlobGeometryChange;)
 }