Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

1 files changed, 2 insertions, 8 deletions

diff --git a/WebCore/platform/graphics/filters/FEBlend.h b/WebCore/platform/graphics/filters/FEBlend.h
index 52de647..2e67588 100644
--- a/WebCore/platform/graphics/filters/FEBlend.h
+++ b/WebCore/platform/graphics/filters/FEBlend.h
@@ -40,24 +40,18 @@ namespace WebCore {
 
     class FEBlend : public FilterEffect {
     public:
-        static PassRefPtr<FEBlend> create(FilterEffect*, FilterEffect*, BlendModeType);
-
-        FilterEffect* in2() const;
-        void setIn2(FilterEffect*);
+        static PassRefPtr<FEBlend> create(BlendModeType);
 
         BlendModeType blendMode() const;
         void setBlendMode(BlendModeType);
 
-        virtual FloatRect uniteChildEffectSubregions(Filter* filter) { return calculateUnionOfChildEffectSubregions(filter, m_in.get(), m_in2.get()); }
         void apply(Filter*);
         void dump();
         TextStream& externalRepresentation(TextStream&, int indent) const;
 
     private:
-        FEBlend(FilterEffect*, FilterEffect*, BlendModeType);
+        FEBlend(BlendModeType);
 
-        RefPtr<FilterEffect> m_in;
-        RefPtr<FilterEffect> m_in2;
         BlendModeType m_mode;
     };