[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[cmarrin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ee6cddcd417b998cfbbd21290ab4c4bb1edff998
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 23:07:44 2011 +0000

    2011-01-07  Chris Marrin  <cmarrin at apple.com>
    
            Unreviewed.
    
            Use new wkCACFLayerGetContextUserData function
    
            * platform/graphics/ca/win/PlatformCALayerWin.cpp:
    
    2011-01-07  Chris Marrin  <cmarrin at apple.com>
    
            Unreviewed.
    
            Minor change to check for null context
    
            * win/lib/WebKitSystemInterface.lib:
            * win/lib/WebKitSystemInterface_debug.lib:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1307a05..d627c43 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-07  Chris Marrin  <cmarrin at apple.com>
+
+        Unreviewed.
+
+        Use new wkCACFLayerGetContextUserData function
+
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+
 2011-01-07  James Robinson  <jamesr at chromium.org>
 
         Fix compile bustage due to bad merge in 75276.
diff --git a/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp b/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
index 982b5f6..919c3b3 100644
--- a/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
+++ b/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
@@ -34,6 +34,7 @@
 #include "PlatformCALayerWinInternal.h"
 #include "WKCACFLayerRenderer.h"
 #include <QuartzCore/CoreAnimationCF.h>
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
 
@@ -67,13 +68,11 @@ static CFStringRef toCACFFilterType(PlatformCALayer::FilterType type)
 static WKCACFLayerRenderer* rendererForLayer(const PlatformCALayer* layer)
 {
     // We need the WKCACFLayerRenderer associated with this layer, which is stored in the UserData of the CACFContext
-    CACFContextRef context = CACFLayerGetContext(layer->platformLayer());
-    if (!context)
+    void* userData = wkCACFLayerGetContextUserData(layer->platformLayer());
+    if (!userData)
         return 0;
 
-    WKCACFLayerRenderer* renderer = static_cast<WKCACFLayerRenderer*>(CACFContextGetUserData(context));
-    ASSERT(renderer);
-    return renderer;
+    return static_cast<WKCACFLayerRenderer*>(userData);
 }
 
 static PlatformCALayerWinInternal* intern(const PlatformCALayer* layer)
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 7eca53e..9d9d930 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -2,6 +2,15 @@
 
         Unreviewed.
 
+        Minor change to check for null context
+
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
+2011-01-07  Chris Marrin  <cmarrin at apple.com>
+
+        Unreviewed.
+
         Added one more API to WKSI to get the user data
         out of the CACFContext.
 
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 683cd05..a649d73 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index ce7731f..f21c19a 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ

-- 
WebKit Debian packaging