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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e0d8952725007fdb771026b29166b3495a59c437
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 18:36:05 2010 +0000

    Remove WKCACFLayer::Lanczos
    
    This member is also unused.
    
    Rubber-stamped in advance by John Sullivan.
    
    * platform/graphics/win/WKCACFLayer.cpp:
    (WebCore::toCACFFilterType):
    (WebCore::fromCACFFilterType):
    * platform/graphics/win/WKCACFLayer.h:
    (WebCore::WKCACFLayer::):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64295 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d0a634c..0431cfb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,19 @@
 2010-07-29  Adam Roben  <aroben at apple.com>
 
+        Remove WKCACFLayer::Lanczos
+
+        This member is also unused.
+
+        Rubber-stamped in advance by John Sullivan.
+
+        * platform/graphics/win/WKCACFLayer.cpp:
+        (WebCore::toCACFFilterType):
+        (WebCore::fromCACFFilterType):
+        * platform/graphics/win/WKCACFLayer.h:
+        (WebCore::WKCACFLayer::):
+
+2010-07-29  Adam Roben  <aroben at apple.com>
+
         Remove some unused WKCACFLayer members
 
         Fixes <http://webkit.org/b/43200> WKCACFLayer has some unused members
diff --git a/WebCore/platform/graphics/win/WKCACFLayer.cpp b/WebCore/platform/graphics/win/WKCACFLayer.cpp
index d3928f1..9d7465c 100644
--- a/WebCore/platform/graphics/win/WKCACFLayer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayer.cpp
@@ -123,7 +123,6 @@ static CFStringRef toCACFFilterType(WKCACFLayer::FilterType type)
     case WKCACFLayer::Linear: return kCACFFilterLinear;
     case WKCACFLayer::Nearest: return kCACFFilterNearest;
     case WKCACFLayer::Trilinear: return kCACFFilterTrilinear;
-    case WKCACFLayer::Lanczos: return kCACFFilterLanczos;
     default: return 0;
     }
 }
@@ -136,9 +135,6 @@ static WKCACFLayer::FilterType fromCACFFilterType(CFStringRef string)
     if (CFEqual(string, kCACFFilterTrilinear))
         return WKCACFLayer::Trilinear;
 
-    if (CFEqual(string, kCACFFilterLanczos))
-        return WKCACFLayer::Lanczos;
-
     return WKCACFLayer::Linear;
 }
 
diff --git a/WebCore/platform/graphics/win/WKCACFLayer.h b/WebCore/platform/graphics/win/WKCACFLayer.h
index 55eeca5..ed39297 100644
--- a/WebCore/platform/graphics/win/WKCACFLayer.h
+++ b/WebCore/platform/graphics/win/WKCACFLayer.h
@@ -56,7 +56,7 @@ protected:
 class WKCACFLayer : public RefCounted<WKCACFLayer> {
 public:
     enum LayerType { Layer, TransformLayer };
-    enum FilterType { Linear, Nearest, Trilinear, Lanczos };
+    enum FilterType { Linear, Nearest, Trilinear };
     enum ContentsGravityType { Center, Top, Bottom, Left, Right, TopLeft, TopRight, 
                                BottomLeft, BottomRight, Resize, ResizeAspect, ResizeAspectFill };
 

-- 
WebKit Debian packaging