Clean up EGL thread state at thread exit in nanobench and DM

src/core/SkTaskGroup.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTaskGroup_DEFINED
 #define SkTaskGroup_DEFINED
 
 #include <functional>
 
 #include "SkTypes.h"
 #include "SkAtomics.h"
 #include "SkTemplates.h"
 
 class SkTaskGroup : SkNoncopyable {
 public:
     // Create one of these in main() to enable SkTaskGroups globally.
     struct Enabler : SkNoncopyable {
-        explicit Enabler(int threads = -1);  // Default is system-reported core count.
+        // @param threads Default is system-reported core count.
+        // @param cleanupFn Function to call in each thread that may have
+        //        scheduled SkTaskGroup tasks.
+        explicit Enabler(int threads = -1, std::function<void(void)> cleanupFn = nullptr);
         ~Enabler();
+      private:
+        std::function<void(void)> fCleanupFn;
     };
 
     SkTaskGroup();
     ~SkTaskGroup() { this->wait(); }
 
     // Add a task to this SkTaskGroup.  It will likely run on another thread.
     void add(std::function<void(void)> fn);
 
     // Add a batch of N tasks, all calling fn with different arguments.
     void batch(int N, std::function<void(int)> fn);
 
     // Block until all Tasks previously add()ed to this SkTaskGroup have run.
     // You may safely reuse this SkTaskGroup after wait() returns.
     void wait();
 
 private:
     SkAtomic<int32_t> fPending;
 };
 
 // Returns best estimate of number of CPU cores available to use.
 int sk_num_cores();
 
 #endif//SkTaskGroup_DEFINED