More natural way to serialize GPU tasks and tests.

dm/DMSrcSink.h

 #ifndef DMSrcSink_DEFINED
 #define DMSrcSink_DEFINED
 
 #include "DMGpuSupport.h"
 #include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkGPipe.h"
@@ skipping 23 matching lines @@
     // You may write to either the bitmap or stream.
     virtual Error SK_WARN_UNUSED_RESULT draw(const Src&, SkBitmap*, SkWStream*) const
         = 0;
     // Sinks in the same enclave (except kAnyThread_Enclave) will run serially on the same thread.
     virtual int enclave() const = 0;
 
     // File extension for the content draw() outputs, e.g. "png", "pdf".
     virtual const char* fileExtension() const  = 0;
 };
 
-enum { kAnyThread_Enclave, kGPUSink_Enclave, kPDFSink_Enclave };
+enum { kAnyThread_Enclave, kGPU_Enclave, kPDFSink_Enclave };
 static const int kNumEnclaves = kPDFSink_Enclave + 1;
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 class GMSrc : public Src {
 public:
     explicit GMSrc(skiagm::GMRegistry::Factory);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
@@ skipping 107 matching lines @@
     const char* fileExtension() const SK_OVERRIDE { return fSink->fileExtension(); }
 private:
     const int                   fW, fH;
     SkAutoTDelete<SkBBHFactory> fFactory;
     SkAutoTDelete<Sink>         fSink;
 };
 
 }  // namespace DM
 
 #endif//DMSrcSink_DEFINED