Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / filters / FEMerge.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp b/src/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp
index c31440d..261596d 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp
@@ -24,12 +24,11 @@
 #include "platform/graphics/filters/FEMerge.h"
 
 #include "SkMergeImageFilter.h"
-#include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
 #include "platform/text/TextStream.h"
 #include "wtf/OwnPtr.h"
 
-namespace WebCore {
+namespace blink {
 
 FEMerge::FEMerge(Filter* filter)
     : FilterEffect(filter)
@@ -41,22 +40,6 @@ PassRefPtr<FEMerge> FEMerge::create(Filter* filter)
     return adoptRef(new FEMerge(filter));
 }
 
-void FEMerge::applySoftware()
-{
-    unsigned size = numberOfEffectInputs();
-    ASSERT(size > 0);
-
-    ImageBuffer* resultImage = createImageBufferResult();
-    if (!resultImage)
-        return;
-
-    GraphicsContext* filterContext = resultImage->context();
-    for (unsigned i = 0; i < size; ++i) {
-        FilterEffect* in = inputEffect(i);
-        filterContext->drawImageBuffer(in->asImageBuffer(), drawingRegionOfInputImage(in->absolutePaintRect()));
-    }
-}
-
 PassRefPtr<SkImageFilter> FEMerge::createImageFilter(SkiaImageFilterBuilder* builder)
 {
     unsigned size = numberOfEffectInputs();
@@ -68,7 +51,7 @@ PassRefPtr<SkImageFilter> FEMerge::createImageFilter(SkiaImageFilterBuilder* bui
         inputs[i] = inputRefs[i].get();
     }
     SkImageFilter::CropRect rect = getCropRect(builder->cropOffset());
-    return adoptRef(new SkMergeImageFilter(inputs.get(), size, 0, &rect));
+    return adoptRef(SkMergeImageFilter::Create(inputs.get(), size, 0, &rect));
 }
 
 TextStream& FEMerge::externalRepresentation(TextStream& ts, int indent) const
@@ -84,4 +67,4 @@ TextStream& FEMerge::externalRepresentation(TextStream& ts, int indent) const
     return ts;
 }
 
-} // namespace WebCore
+} // namespace blink