diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/platform/graphics/filters/FEColorMatrix.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/platform/graphics/filters/FEColorMatrix.h')
| -rw-r--r-- | WebCore/platform/graphics/filters/FEColorMatrix.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/filters/FEColorMatrix.h b/WebCore/platform/graphics/filters/FEColorMatrix.h index b898b17..a3ced7e 100644 --- a/WebCore/platform/graphics/filters/FEColorMatrix.h +++ b/WebCore/platform/graphics/filters/FEColorMatrix.h @@ -40,7 +40,7 @@ enum ColorMatrixType { class FEColorMatrix : public FilterEffect { public: - static PassRefPtr<FEColorMatrix> create(ColorMatrixType, const Vector<float>&); + static PassRefPtr<FEColorMatrix> create(Filter*, ColorMatrixType, const Vector<float>&); ColorMatrixType type() const; void setType(ColorMatrixType); @@ -48,13 +48,13 @@ public: const Vector<float>& values() const; void setValues(const Vector<float>&); - virtual void apply(Filter*); + virtual void apply(); virtual void dump(); virtual TextStream& externalRepresentation(TextStream&, int indention) const; private: - FEColorMatrix(ColorMatrixType, const Vector<float>&); + FEColorMatrix(Filter*, ColorMatrixType, const Vector<float>&); ColorMatrixType m_type; Vector<float> m_values; |