Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: include/views/SkOSWindow_Win.h

Issue 1441753002: Replace SkFunction with std::function (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/private/SkFunction.h ('k') | src/gpu/GrTextureParamsAdjuster.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/views/SkOSWindow_Win.h
diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index b65d4c29dfb18efa3845a9cae63c5f6dd9f7f8c7..c1a68c621e4dfb148aa5d6a56eac7222685438b7 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);
}
« no previous file with comments | « include/private/SkFunction.h ('k') | src/gpu/GrTextureParamsAdjuster.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698