Begin kLegacyFontHost_InitType cleanup

tests/LayerDrawLooperTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkDraw.h"
 #include "SkLayerDrawLooper.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 #include "SkSmallAllocator.h"
 #include "SkXfermode.h"
 #include "Test.h"
 
 static SkBitmap make_bm(int w, int h) {
     SkBitmap bm;
     bm.allocN32Pixels(w, h);
     return bm;
 }
 
+// TODO: can this be derived from SkBaseDevice?
 class FakeDevice : public SkBitmapDevice {
 public:
-    FakeDevice() : SkBitmapDevice(make_bm(100, 100)) { }
+    FakeDevice() : INHERITED(make_bm(100, 100), SkSurfaceProps(0, kUnknown_SkPixelGeometry)) {
+    }
 
-    virtual void drawRect(const SkDraw& draw, const SkRect& r,
-                          const SkPaint& paint) override {
+    void drawRect(const SkDraw& draw, const SkRect& r, const SkPaint& paint) override {
         fLastMatrix = *draw.fMatrix;
         this->INHERITED::drawRect(draw, r, paint);
     }
 
     SkMatrix fLastMatrix;
 
 private:
     typedef SkBitmapDevice INHERITED;
 };
 
@@ skipping 115 matching lines @@
 
     // Only two layers were added, so that should be the end.
     REPORTER_ASSERT(reporter, !context->next(&canvas, &paint));
 }
 
 DEF_TEST(LayerDrawLooper, reporter) {
     test_frontToBack(reporter);
     test_backToFront(reporter);
     test_mixed(reporter);
 }