Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.

include/core/SkData.h

Index: include/core/SkData.h
diff --git a/include/core/SkData.h b/include/core/SkData.h
index e34d861675bae812f3397017a4f87b5c337348b0..4306208f69e44bfdb023bb5e74450f376948c636 100644
--- a/include/core/SkData.h
+++ b/include/core/SkData.h
@@ -14,10 +14,6 @@
 
 class SkStream;
 
-#ifndef SK_SUPPORT_LEGACY_DATA_FACTORIES
-#define SK_SUPPORT_LEGACY_DATA_FACTORIES
-#endif
-
 /**
  *  SkData holds an immutable data buffer. Not only is the data immutable,
  *  but the actual ptr that is returned (by data() or bytes()) is guaranteed
@@ -71,7 +67,9 @@ public:
      *  effectively returning 0 == memcmp(...)
      */
     bool equals(const SkData* other) const;
+#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES

[reed1, 2016/08/02 21:11:25]

why is this guy guarded?

[bungeman-skia, 2016/08/02 21:29:56]

This has caused some rather awkward code in Chromium when they attempted to use
it. It has unexpected and rather surprising meaning.

For example, this will not bind to a 'sk_sp<SkData>' value at all. That would
require the parameter type to be 'const sk_sp<const SkData>&'. But not having
this signature is actually a good thing, because if someone did call this
signature with an sk_sp<SkData> there would be a ref/unref pair at the call
site. However, almost no one actually has an sk_sp<const SkData> since they're
generally considered const (it does have writable_data(), but we generally
assume no one but the creator of the SkData is going to call it). Generally,
taking smart pointers by reference turns out not to work very well.

It turns out there was just one test file that used this at all, and there is
only one very awkward user in Chromium which would be way better off calling the
other 'equals'. If it turns out we really need something like this in the
future, we can see about adding something back that isn't as awkward.

     bool equals(sk_sp<const SkData>& other) const { return this->equals(other.get()); }
+#endif
 
     /**
      *  Function that, if provided, will be called when the SkData goes out