update example

experimental/SkiaExamples/SkExample.h

 /*
  * Copyright 2013 Google Inc.
  *
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #ifndef SkExample_DEFINED
 #define SkExample_DEFINED
 
+#include "SkSurface.h"
 #include "SkWindow.h"
 #include "SkTRegistry.h"
 
 class GrContext;
 struct GrGLInterface;
 class GrRenderTarget;
 class SkCanvas;
 class SkExampleWindow;
 
 class SkExample : SkNoncopyable {
@@ skipping 14 matching lines @@
     SkString fName;
 };
 
 class SkExampleWindow : public SkOSWindow {
 public:
     enum DeviceType {
         kRaster_DeviceType,
         kGPU_DeviceType,
     };
     SkExampleWindow(void* hwnd);
+    virtual ~SkExampleWindow();

[bsalomon, 2015/01/30 19:19:12]

~SkExampleWindow() SK_OVERRIDE?

[caryclark, 2015/01/30 19:55:28]

Done.

 
     // Changes the device type of the object.
-    bool setupBackend(DeviceType type);
-    void tearDownBackend();
+    bool setUpBackend();
 
     DeviceType getDeviceType() const { return fType; }
 
 protected:
+    static void release_storage(void* pixels, void* context) {

[bsalomon, 2015/01/30 19:19:12]

ReleaseStorage?

[caryclark, 2015/01/30 19:55:28]

The whole function is unused so I deleted it.

+        SkASSERT(pixels == context);
+        sk_free(pixels);
+    }
+
+    SkSurface* createSurface() SK_OVERRIDE {
+        if (kGPU_DeviceType == fType) {
+            SkSurfaceProps props(INHERITED::getSurfaceProps());
+            return SkSurface::NewRenderTargetDirect(fRenderTarget, &props);
+        }
+        static const SkImageInfo info = SkImageInfo::MakeN32Premul(
+                SkScalarRoundToInt(this->width()), SkScalarRoundToInt(this->height()));
+        return fSurface = SkSurface::NewRaster(info);
+   }
+
     void draw(SkCanvas* canvas) SK_OVERRIDE;
 
     void onSizeChange() SK_OVERRIDE;
 
-#ifdef SK_BUILD_FOR_WIN
-    void onHandleInval(const SkIRect&) SK_OVERRIDE;
-#endif
-
-    SkCanvas* createCanvas() SK_OVERRIDE;
-
 private:
     bool findNextMatch();  // Set example to the first one that matches FLAGS_match.
-    void setupRenderTarget();
+    void setTitle();
+    void setUpRenderTarget();
     bool onHandleChar(SkUnichar unichar) SK_OVERRIDE;
+    void tearDownBackend();
 
     DeviceType fType;
-
+    SkSurface* fSurface;
     SkExample* fCurrExample;
     const SkExample::Registry* fRegistry;
     GrContext* fContext;
     GrRenderTarget* fRenderTarget;
     AttachmentInfo fAttachmentInfo;
     const GrGLInterface* fInterface;
 
     typedef SkOSWindow INHERITED;
 };
 
 #endif