use surface in SkView/SampleApp

include/views/SkWindow.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkWindow_DEFINED
 #define SkWindow_DEFINED
 
 #include "SkView.h"
 #include "SkBitmap.h"
 #include "SkMatrix.h"
 #include "SkRegion.h"
 #include "SkEvent.h"
 #include "SkKey.h"
 #include "SkTDArray.h"
 
 #ifdef SK_BUILD_FOR_WINCEx
     #define SHOW_FPS
 #endif
 //#define USE_GX_SCREEN
 
-class SkCanvas;
-
+class SkSurface;
 class SkOSMenu;
 
 class SkWindow : public SkView {
 public:
             SkWindow();
     virtual ~SkWindow();
 
     const SkBitmap& getBitmap() const { return fBitmap; }
 
     void    setColorType(SkColorType);
@@ skipping 16 matching lines @@
     const SkTDArray<SkOSMenu*>* getMenus() { return &fMenus; }
 
     const char* getTitle() const { return fTitle.c_str(); }
     void    setTitle(const char title[]);
 
     const SkMatrix& getMatrix() const { return fMatrix; }
     void    setMatrix(const SkMatrix&);
     void    preConcat(const SkMatrix&);
     void    postConcat(const SkMatrix&);
 
-    virtual SkCanvas* createCanvas();
+    virtual SkSurface* createSurface();
 
     virtual void onPDFSaved(const char title[], const char desc[],
         const char path[]) {}
 protected:
     virtual bool onEvent(const SkEvent&);
     virtual bool onDispatchClick(int x, int y, Click::State, void* owner, unsigned modi);
     // called if part of our bitmap is invalidated
     virtual void onHandleInval(const SkIRect&);
     virtual bool onHandleChar(SkUnichar);
     virtual bool onHandleKey(SkKey);
@@ skipping 37 matching lines @@
     #include "SkOSWindow_Android.h"
 #elif defined(SK_BUILD_FOR_UNIX)
   #include "SkOSWindow_Unix.h"
 #elif defined(SK_BUILD_FOR_SDL)
     #include "SkOSWindow_SDL.h"
 #elif defined(SK_BUILD_FOR_IOS)
     #include "SkOSWindow_iOS.h"
 #endif
 
 #endif