Optionally run RAW images serially

dm/DMSrcSink.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef DMSrcSink_DEFINED
 #define DMSrcSink_DEFINED
 
 #include "DMGpuSupport.h"
 #include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
 #include "SkBitmap.h"
 #include "SkBitmapRegionDecoder.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkPicture.h"
 #include "gm.h"
 
 namespace DM {
 
+// Return the extension of the provided SkString. Returns a pointer into the SkString's
+// data, so its lifetime is the same as the SkString.
+const char* SkStringExtension(const SkString&);

[scroggo, 2016/02/08 18:57:52]

I needed this in more than one place, and both of those places are in DM, so I
put it here. I could put it in SkString or SkOSFile (in SkOSPath class) if we
think more clients will want it.

[mtklein, 2016/02/08 21:26:55]

Better call this FileExtension() or FileNameExtension()?
It's not part of Skia, and SkStrings don't have an extension.

I still think this is probably simpler and clearer inline:

  const char* ext = strrchr(path.c_str(), '.');
  if (ext++) {
      ... use ext ... 
  }

+
 // This is just convenience.  It lets you use either return "foo" or return SkStringPrintf(...).
 struct ImplicitString : public SkString {
     template <typename T>
     ImplicitString(const T& s) : SkString(s) {}
     ImplicitString() : SkString("") {}
 };
 typedef ImplicitString Name;
 typedef ImplicitString Path;
 
 class Error {
@@ skipping 18 matching lines @@
 private:
     SkString fMsg;
     bool     fFatal;
 };
 
 struct SinkFlags {
     enum { kNull, kGPU, kVector, kRaster } type;
     enum { kDirect, kIndirect } approach;
 };
 
+enum { kAnyThread_Enclave,
+       kGPU_Enclave,
+#ifdef SK_CODEC_DECODES_RAW

[mtklein, 2016/02/08 21:26:55]

Why the #ifdef?

+       kRAW_Enclave,
+#endif
+       kNumEnclaves,
+     };
+
 struct Src {
     // All Srcs must be thread safe.

[mtklein, 2016/02/08 21:26:55]

Better update / remove this.

     virtual ~Src() {}
     virtual Error SK_WARN_UNUSED_RESULT draw(SkCanvas*) const = 0;
     virtual SkISize size() const = 0;
     virtual Name name() const = 0;
     virtual void modifyGrContextOptions(GrContextOptions* options) const {}
     virtual bool veto(SinkFlags) const { return false; }
+    // If not kAnyThread_Enclave, overrides the Sink's enclave
+    virtual int enclave() const { return kAnyThread_Enclave; }
 };
 
 struct Sink {
     virtual ~Sink() {}
     // You may write to either the bitmap or stream.  If you write to log, we'll print that out.
     virtual Error SK_WARN_UNUSED_RESULT draw(const Src&, SkBitmap*, SkWStream*, SkString* log)
         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;
 
     virtual SinkFlags flags() const = 0;
 };
 
-enum { kAnyThread_Enclave, kGPU_Enclave };
-static const int kNumEnclaves = kGPU_Enclave + 1;
-
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 class GMSrc : public Src {
 public:
     explicit GMSrc(skiagm::GMRegistry::Factory);
 
     Error draw(SkCanvas*) const override;
     SkISize size() const override;
     Name name() const override;
     void modifyGrContextOptions(GrContextOptions* options) const override;
@@ skipping 19 matching lines @@
         kGetFromCanvas_DstColorType,
         kIndex8_Always_DstColorType,
         kGrayscale_Always_DstColorType,
     };
     CodecSrc(Path, Mode, DstColorType, SkAlphaType, float);
 
     Error draw(SkCanvas*) const override;
     SkISize size() const override;
     Name name() const override;
     bool veto(SinkFlags) const override;
+    int enclave() const override;
 private:
     Path                    fPath;
     Mode                    fMode;
     DstColorType            fDstColorType;
     SkAlphaType             fDstAlphaType;
     float                   fScale;
 };
 
 class AndroidCodecSrc : public Src {
 public:
@@ skipping 222 matching lines @@
 
 class ViaMojo : public Via {
 public:
     explicit ViaMojo(Sink* sink) : Via(sink) {}
     Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
 };
 
 }  // namespace DM
 
 #endif//DMSrcSink_DEFINED