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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 93612678176de2de4ee69f923a173d291024307f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 23:55:16 2010 +0000

    Fix some clang++ build errors.
    
    * platform/graphics/ca/GraphicsLayerCA.cpp:
    (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
    Remove unused variable.
    
    * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
    * platform/graphics/ca/mac/PlatformCALayerMac.mm:
    Fix constness of pointers.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fff9380..53695b9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-07  Anders Carlsson  <andersca at apple.com>
+
+        Fix some clang++ build errors.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
+        Remove unused variable.
+
+        * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        Fix constness of pointers.
+
 2010-12-07  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Chris Marrin.
diff --git a/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
index 6a425a7..548838e 100644
--- a/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
+++ b/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -1921,8 +1921,6 @@ void GraphicsLayerCA::swapFromOrToTiledLayer(bool useTiledLayer)
     if (useTiledLayer == m_usingTiledLayer)
         return;
 
-    CGSize tileSize = CGSizeMake(kTiledLayerTileSize, kTiledLayerTileSize);
-
     RefPtr<PlatformCALayer> oldLayer = m_layer;
     
     m_layer = PlatformCALayer::create(useTiledLayer ? PlatformCALayer::LayerTypeWebTiledLayer : PlatformCALayer::LayerTypeWebLayer, this);
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
index 2967d18..818317c 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
@@ -40,7 +40,7 @@
 using namespace WebCore;
 
 // This value must be the same as in PlatformCALayerMac.mm
-static const NSString* WKNonZeroBeginTimeFlag = @"WKPlatformCAAnimationNonZeroBeginTimeFlag";
+static NSString * const WKNonZeroBeginTimeFlag = @"WKPlatformCAAnimationNonZeroBeginTimeFlag";
 
 static inline void copyTransform(CATransform3D& toT3D, const TransformationMatrix& t)
 {
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
index b94f07b..d06e487 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -46,7 +46,7 @@
 using namespace WebCore;
 
 // This value must be the same as in PlatformCAAnimationMac.mm
-static const NSString* WKNonZeroBeginTimeFlag = @"WKPlatformCAAnimationNonZeroBeginTimeFlag";
+static NSString * const WKNonZeroBeginTimeFlag = @"WKPlatformCAAnimationNonZeroBeginTimeFlag";
 
 static double mediaTimeToCurrentTime(CFTimeInterval t)
 {
@@ -93,7 +93,7 @@ static double mediaTimeToCurrentTime(CFTimeInterval t)
 - (void)setContentsChanged;
 @end
 
-static const NSString* platformCALayerPointer = @"WKPlatformCALayer";
+static NSString * const platformCALayerPointer = @"WKPlatformCALayer";
 
 static inline void copyTransform(CATransform3D& toT3D, const TransformationMatrix& t)
 {

-- 
WebKit Debian packaging