Port SkBlurImage opts to SkOpts.

src/opts/SkXfermode_opts.h

Index: src/opts/SkXfermode_opts.h
diff --git a/src/opts/SkXfermode_opts.h b/src/opts/SkXfermode_opts.h
index 6bc76fe559a9c0f6685aafc2a6941f530f4890e0..e5ca257a2802fe55302fb8d6be01c9f76e7bf0d3 100644
--- a/src/opts/SkXfermode_opts.h
+++ b/src/opts/SkXfermode_opts.h
@@ -12,9 +12,7 @@
 #include "SkPMFloat.h"
 #include "SkXfermode_proccoeff.h"
 
-// This file is possibly included into multiple .cpp files.
-// Each gets its own independent instantiation by wrapping in an anonymous namespace.
-namespace {
+namespace /* TODO: SK_OPTS_NS */ {

[djsollen, 2015/08/04 14:39:56]

I don't think there is a need to touch this file in this CL.

[mtklein, 2015/08/04 14:46:44]

I want to keep everything consistently using SK_OPTS_NS.

However, using SK_OPTS_NS here triggers a warning with some compilers.  I want
to sort that out in another CL.

[djsollen, 2015/08/04 14:56:17]

Acknowledged.

 
 // Most xfermodes can be done most efficiently 4 pixels at a time in 8 or 16-bit fixed point.
 #define XFERMODE(Name) static Sk4px SK_VECTORCALL Name(Sk4px s, Sk4px d)
@@ -316,6 +314,6 @@ static SkXfermode* SkCreate4pxXfermode(const ProcCoeff& rec, SkXfermode::Mode mo
     return nullptr;
 }
 
-} // namespace
+} // namespace SK_NS_OPTS
 
 #endif//Sk4pxXfermode_DEFINED