summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/filters/FEComposite.h
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-12-07 17:22:45 -0800
committerShimeng (Simon) Wang <swang@google.com>2010-12-22 14:15:40 -0800
commit4576aa36e9a9671459299c7963ac95aa94beaea9 (patch)
tree3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/platform/graphics/filters/FEComposite.h
parent55323ac613cc31553107b68603cb627264d22bb0 (diff)
downloadexternal_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/FEComposite.h')
-rw-r--r--WebCore/platform/graphics/filters/FEComposite.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/filters/FEComposite.h b/WebCore/platform/graphics/filters/FEComposite.h
index ecdb037..b846902 100644
--- a/WebCore/platform/graphics/filters/FEComposite.h
+++ b/WebCore/platform/graphics/filters/FEComposite.h
@@ -42,7 +42,7 @@ enum CompositeOperationType {
class FEComposite : public FilterEffect {
public:
- static PassRefPtr<FEComposite> create(const CompositeOperationType&, float, float, float, float);
+ static PassRefPtr<FEComposite> create(Filter*, const CompositeOperationType&, float, float, float, float);
CompositeOperationType operation() const;
void setOperation(CompositeOperationType);
@@ -59,15 +59,15 @@ public:
float k4() const;
void setK4(float);
- virtual void apply(Filter*);
+ virtual void apply();
virtual void dump();
- virtual void determineAbsolutePaintRect(Filter*);
+ virtual void determineAbsolutePaintRect();
virtual TextStream& externalRepresentation(TextStream&, int indention) const;
private:
- FEComposite(const CompositeOperationType&, float, float, float, float);
+ FEComposite(Filter*, const CompositeOperationType&, float, float, float, float);
CompositeOperationType m_type;
float m_k1;