Replace SkFunction with std::function

include/views/SkOSWindow_Win.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 SkOSWindow_Win_DEFINED
 #define SkOSWindow_Win_DEFINED
 
-#include "../private/SkFunction.h"
 #include "../private/SkTHash.h"
 #include "SkWindow.h"
+#include <functional>
 
 #if SK_ANGLE
 #include "EGL/egl.h"
 #endif
 
 #if SK_COMMAND_BUFFER
 class SkCommandBufferGLContext;
 #endif
 
 class SkOSWindow : public SkWindow {
@@ skipping 38 matching lines @@
     void closeWindow();
 
     static SkOSWindow* GetOSWindowForHWND(void* hwnd) {
         SkOSWindow** win = gHwndToOSWindowMap.find(hwnd);
         if (!win) {
             return NULL;
         }
         return *win;
     }
 
-    // Iterates SkFunction over all the SkOSWindows and their corresponding HWNDs.
-    // The void* argument to the SkFunction is a HWND.
-    static void ForAllWindows(const SkFunction<void(void*, SkOSWindow**)>& f) {
+    // Iterates f over all the SkOSWindows and their corresponding HWNDs.
+    // The void* argument to f is a HWND.
+    static void ForAllWindows(const std::function<void(void*, SkOSWindow**)>& f) {
         gHwndToOSWindowMap.foreach(f);
     }
 
 protected:
     virtual bool quitOnDeactivate() { return true; }
 
     // overrides from SkWindow
     virtual void onHandleInval(const SkIRect&);
     // overrides from SkView
     virtual void onAddMenu(const SkOSMenu*);
@@ skipping 53 matching lines @@
     bool attachCommandBuffer(int msaaSampleCount, AttachmentInfo* info);
     void detachCommandBuffer();
     void presentCommandBuffer();
 #endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
 
     typedef SkWindow INHERITED;
 };
 
 #endif