9ea3d57fde
Now that all creation of SkImageFilters goes through factory Create() methods, there's no real reason for the convenience constructors. Some SkImageFilter subclasses which actually have zero DAG-able inputs were passing NULL to the superclass constructor. This actually means 1 input, with a NULL value, not zero inputs. This becomes more relevant for the upcoming cache infrastructure, where this indicates that the filter will use its src input, where in fact some of these filters do not (they are image generators only). Limiting SkImageFilter to a single constructor resolves this ambiguity. Along the way, I removed all of the default parameters to the constructors, since the Create methods always call them with the full argument list. BUG=skia: R=reed@google.com Author: senorblanco@chromium.org Review URL: https://codereview.chromium.org/376953003
72 lines
2.7 KiB
C++
72 lines
2.7 KiB
C++
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkDisplacementMapEffect_DEFINED
|
|
#define SkDisplacementMapEffect_DEFINED
|
|
|
|
#include "SkImageFilter.h"
|
|
#include "SkBitmap.h"
|
|
|
|
class SK_API SkDisplacementMapEffect : public SkImageFilter {
|
|
public:
|
|
enum ChannelSelectorType {
|
|
kUnknown_ChannelSelectorType,
|
|
kR_ChannelSelectorType,
|
|
kG_ChannelSelectorType,
|
|
kB_ChannelSelectorType,
|
|
kA_ChannelSelectorType
|
|
};
|
|
|
|
~SkDisplacementMapEffect();
|
|
|
|
static SkDisplacementMapEffect* Create(ChannelSelectorType xChannelSelector,
|
|
ChannelSelectorType yChannelSelector,
|
|
SkScalar scale, SkImageFilter* displacement,
|
|
SkImageFilter* color = NULL,
|
|
const CropRect* cropRect = NULL) {
|
|
SkImageFilter* inputs[2] = { displacement, color };
|
|
return SkNEW_ARGS(SkDisplacementMapEffect, (xChannelSelector, yChannelSelector, scale,
|
|
inputs, cropRect));
|
|
}
|
|
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)
|
|
|
|
virtual bool onFilterImage(Proxy* proxy,
|
|
const SkBitmap& src,
|
|
const Context& ctx,
|
|
SkBitmap* dst,
|
|
SkIPoint* offset) const SK_OVERRIDE;
|
|
virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
|
|
|
|
virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
|
|
SkIRect* dst) const SK_OVERRIDE;
|
|
|
|
#if SK_SUPPORT_GPU
|
|
virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
|
|
virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
|
|
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
|
|
#endif
|
|
|
|
protected:
|
|
SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
|
|
ChannelSelectorType yChannelSelector,
|
|
SkScalar scale, SkImageFilter* inputs[2],
|
|
const CropRect* cropRect);
|
|
explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
|
|
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
|
private:
|
|
ChannelSelectorType fXChannelSelector;
|
|
ChannelSelectorType fYChannelSelector;
|
|
SkScalar fScale;
|
|
typedef SkImageFilter INHERITED;
|
|
const SkImageFilter* getDisplacementInput() const { return getInput(0); }
|
|
const SkImageFilter* getColorInput() const { return getInput(1); }
|
|
};
|
|
|
|
#endif
|