Merge 70652 - 2010-10-27 Justin Schuh <jschuh@chromium.org>...

WebCore/platform/graphics/filters/FEBlend.cpp

 /*
     Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
                   2005 Eric Seidel <eric@webkit.org>
                   2009 Dirk Schulze <krit@webkit.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 87 matching lines @@
     return ((std::max((255 - alphaA) * colorB + colorA * 255, (255 - alphaB) * colorA + colorB * 255)) / 255);
 }
 
 void FEBlend::apply(Filter* filter)
 {
     m_in->apply(filter);
     m_in2->apply(filter);
     if (!m_in->resultImage() || !m_in2->resultImage())
         return;
 
-    if (m_mode == FEBLEND_MODE_UNKNOWN)
+    if (m_mode <= FEBLEND_MODE_UNKNOWN || m_mode > FEBLEND_MODE_LIGHTEN)
         return;
 
     if (!getEffectContext())
         return;
 
     IntRect effectADrawingRect = calculateDrawingIntRect(m_in->scaledSubRegion());
     RefPtr<CanvasPixelArray> srcPixelArrayA(m_in->resultImage()->getPremultipliedImageData(effectADrawingRect)->data());
 
     IntRect effectBDrawingRect = calculateDrawingIntRect(m_in2->scaledSubRegion());
     RefPtr<CanvasPixelArray> srcPixelArrayB(m_in2->resultImage()->getPremultipliedImageData(effectBDrawingRect)->data());
@@ skipping 58 matching lines @@
     FilterEffect::externalRepresentation(ts);
     ts << " mode=\"" << m_mode << "\"]\n";
     m_in->externalRepresentation(ts, indent + 1);
     m_in2->externalRepresentation(ts, indent + 1);
     return ts;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(FILTERS)