Revert of remove guarded code - there are no more callers

include/effects/SkLayerRasterizer.h

+
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+
 #ifndef SkLayerRasterizer_DEFINED
 #define SkLayerRasterizer_DEFINED
 
 #include "SkRasterizer.h"
 #include "SkDeque.h"
 #include "SkScalar.h"
 
 class SkPaint;
 
 class SK_API SkLayerRasterizer : public SkRasterizer {
@@ skipping 37 matching lines @@
           *  Future calls to addLayer will not affect rasterizers previously returned by this call.
           *
           *  The caller is responsible for calling unref() on the returned object, if non NULL.
           */
         SkLayerRasterizer* snapshotRasterizer() const;
 
     private:
         SkDeque* fLayers;
     };
 
+#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
+    void addLayer(const SkPaint& paint) {
+        this->addLayer(paint, 0, 0);
+    }
+
+    /**    Add a new layer (above any previous layers) to the rasterizer.
+        The layer will extract those fields that affect the mask from
+        the specified paint, but will not retain a reference to the paint
+        object itself, so it may be reused without danger of side-effects.
+    */
+    void addLayer(const SkPaint& paint, SkScalar dx, SkScalar dy);
+#endif
+
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerRasterizer)
 
 protected:
+    SkLayerRasterizer(SkDeque* layers);
+    SkLayerRasterizer(SkReadBuffer&);
     virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
     // override from SkRasterizer
     virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
                              const SkIRect* clipBounds,
                              SkMask* mask, SkMask::CreateMode mode) const;
 
+#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
+public:
+#endif
+    SkLayerRasterizer();
+
 private:
+#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
+    SkDeque* fLayers;
+#else
     const SkDeque* const fLayers;
-
-    SkLayerRasterizer();
-    SkLayerRasterizer(SkDeque* layers);
-    SkLayerRasterizer(SkReadBuffer&);
+#endif
 
     static SkDeque* ReadLayers(SkReadBuffer& buffer);
 
     friend class LayerRasterizerTester;
 
     typedef SkRasterizer INHERITED;
 };
 
 #endif