fix some bit-rot in the ios port of sampleapp

experimental/iOSSampleApp/SkSampleUIView.mm

 #import "SkSampleUIView.h"
 
 #define SKGL_CONFIG         kEAGLColorFormatRGB565
 //#define SKGL_CONFIG         kEAGLColorFormatRGBA8
 
 #define FORCE_REDRAW
 
 #include "SkCanvas.h"
 #include "SkCGUtils.h"
+#include "SkSurface.h"
 #include "SampleApp.h"
 
 #if SK_SUPPORT_GPU
 //#define USE_GL_1
 #define USE_GL_2
 
 #include "gl/GrGLInterface.h"
 #include "GrContext.h"
 #include "SkGpuDevice.h"
 #endif
@@ skipping 92 matching lines @@
         SkSafeUnref(fCurIntf);
         fCurIntf = NULL;
         
         SkSafeUnref(fCurRenderTarget);
         fCurRenderTarget = NULL;
 #endif
         win->detach();
         fBackend = SampleWindow::kNone_BackEndType;
     }
 
-    virtual SkCanvas* createCanvas(SampleWindow::DeviceType dType,
-                                   SampleWindow* win) {
-        switch (dType) {
-            case SampleWindow::kRaster_DeviceType:
-                // fallthrough
-            case SampleWindow::kPicture_DeviceType:
-                // fallthrough
-#if SK_ANGLE
-            case SampleWindow::kANGLE_DeviceType:
+    virtual SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) SK_OVERRIDE{
+#if SK_SUPPORT_GPU
+        if (SampleWindow::IsGpuDeviceType(dType) && fCurContext) {
+            SkSurfaceProps props(win->getSurfaceProps());
+            return SkSurface::NewRenderTargetDirect(fCurRenderTarget, &props);
+        }
 #endif
-                break;
-#if SK_SUPPORT_GPU
-            case SampleWindow::kGPU_DeviceType:
-            case SampleWindow::kNullGPU_DeviceType:
-                if (fCurContext) {
-                    SkAutoTUnref<SkBaseDevice> device(new SkGpuDevice(fCurContext,
-                                                                      fCurRenderTarget));
-                    return new SkCanvas(device);
-                } else {
-                    return NULL;
-                }
-                break;
-#endif
-            default:
-                SkASSERT(false);
-                return NULL;
-        }
         return NULL;
     }
-    
+
     virtual void publishCanvas(SampleWindow::DeviceType dType,
                                SkCanvas* canvas,
                                SampleWindow* win) SK_OVERRIDE {
 #if SK_SUPPORT_GPU
         if (NULL != fCurContext) {
             fCurContext->flush();
         }
 #endif
         win->present();
     }
@@ skipping 250 matching lines @@
     glGetIntegerv(GL_SCISSOR_TEST, &scissorEnable);
     glDisable(GL_SCISSOR_TEST);
     glClearColor(0,0,0,0);
     glClear(GL_COLOR_BUFFER_BIT);
     if (scissorEnable) {
         glEnable(GL_SCISSOR_TEST);
     }
     glViewport(0, 0, fGL.fWidth, fGL.fHeight);
     
    
-    SkAutoTUnref<SkCanvas> canvas(fWind->createCanvas());
+    SkAutoTUnref<SkSurface> surface(fWind->createSurface());
+    SkCanvas* canvas = surface->getCanvas();
+
     // if we're not "retained", then we have to always redraw everything.
     // This call forces us to ignore the fDirtyRgn, and draw everywhere.
     // If we are "retained", we can skip this call (as the raster case does)
     fWind->forceInvalAll();
 
     [self drawWithCanvas:canvas];
-    
+
+    // Do we need to call canvas->flush() here? <reed>
+

[jvanverth1, 2014/10/20 15:03:22]

It appears to be working without it.

[reed1, 2014/10/22 19:56:53]

Done.

     // This application only creates a single color renderbuffer which is already bound at this point.
     // This call is redundant, but needed if dealing with multiple renderbuffers.
     glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer);
     [fGL.fContext presentRenderbuffer:GL_RENDERBUFFER];
-    
 }
 
 - (void)drawInRaster {
-    SkAutoTUnref<SkCanvas> canvas(fWind->createCanvas());
+    SkAutoTUnref<SkSurface> surface(fWind->createSurface());
+    SkCanvas* canvas = surface->getCanvas();
     [self drawWithCanvas:canvas];
     CGImageRef cgimage = SkCreateCGImageRef(fWind->getBitmap());
     fRasterLayer.contents = (id)cgimage;
     CGImageRelease(cgimage);
 }
 
 - (void)forceRedraw {
     if (fDevManager->isUsingGL())
         [self drawInGL];
     else 
@@ skipping 36 matching lines @@
     glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer);
     glGetRenderbufferParameteriv(GL_RENDERBUFFER,
                                  GL_RENDERBUFFER_STENCIL_SIZE,
                                  &info->fStencilBits);
     glGetRenderbufferParameteriv(GL_RENDERBUFFER,
                                  GL_RENDERBUFFER_SAMPLES_APPLE,
                                  &info->fSampleCount);
 }
 
 @end