aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-11-12 10:41:05 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-12 10:41:05 -0800
commit64593525debc63339e1bf9ddb8a0e998f7d976a3 (patch)
treefef4af677389ebf339a80d67294809b64041f798 /include/views
parent3aa5fce54e1d8f4a682eaf6446fa73df962b3778 (diff)
Replace SkFunction with std::function
TBR=reed@google.com No public API changes. Review URL: https://codereview.chromium.org/1441753002
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkOSWindow_Win.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index b65d4c29df..c1a68c621e 100644
--- a/include/views/SkOSWindow_Win.h
+++ b/include/views/SkOSWindow_Win.h
@@ -10,9 +10,9 @@
#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"
@@ -71,9 +71,9 @@ public:
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);
}