[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 2311db29df51444df4970d81d0d345d3c4e06cda
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 18:45:24 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=44193
    
    Reviewed by Martin Robinson.
    
    Fix a typo in my previous canvas checkin.  m_in->resultImage() was originally m_in2->resultImage(),
    and I accidentally changed it when swapping the order of the arguments.
    
    * platform/graphics/filters/FEComposite.cpp:
    (WebCore::FEComposite::apply):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6b4155e..4fdab14 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-18  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Martin Robinson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44193
+
+        Fix a typo in my previous canvas checkin.  m_in->resultImage() was originally m_in2->resultImage(),
+        and I accidentally changed it when swapping the order of the arguments.
+
+        * platform/graphics/filters/FEComposite.cpp:
+        (WebCore::FEComposite::apply):
+
 2010-08-17  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/filters/FEComposite.cpp b/WebCore/platform/graphics/filters/FEComposite.cpp
index 0bafc48..d9f00ce 100644
--- a/WebCore/platform/graphics/filters/FEComposite.cpp
+++ b/WebCore/platform/graphics/filters/FEComposite.cpp
@@ -136,7 +136,7 @@ void FEComposite::apply(Filter* filter)
         break;
     case FECOMPOSITE_OPERATOR_IN:
         filterContext->save();
-        filterContext->clipToImageBuffer(m_in->resultImage(), calculateDrawingRect(m_in2->scaledSubRegion()));
+        filterContext->clipToImageBuffer(m_in2->resultImage(), calculateDrawingRect(m_in2->scaledSubRegion()));
         filterContext->drawImageBuffer(m_in->resultImage(), DeviceColorSpace, calculateDrawingRect(m_in->scaledSubRegion()));
         filterContext->restore();
         break;

-- 
WebKit Debian packaging