Patches on top of Radu's latest.

src/core/SkOpts.h

Index: src/core/SkOpts.h
diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h
index e0ef7dc424f79fb8fb12f007fea84e2b59a476d4..04aa9b175361ebc6adba366655dbf7261d3cc348 100644
--- a/src/core/SkOpts.h
+++ b/src/core/SkOpts.h
@@ -44,6 +44,15 @@ namespace SkOpts {
     extern bool (*fill_block_dimensions)(SkTextureCompressor::Format, int* x, int* y);
 
     extern void (*blit_mask_d32_a8)(SkPMColor*, size_t, const SkAlpha*, size_t, SkColor, int, int);
+
+    // This function is an optimized version of SkColorCubeFilter::filterSpan
+    extern void (*color_cube_filter_span)(const SkPMColor[],
+                                          int,
+                                          SkPMColor[],
+                                          const int * [2],
+                                          const SkScalar * [2],
+                                          int,
+                                          const SkColor*);
 }
 
 #endif//SkOpts_DEFINED