2011-01-07 Chris Marrin <cmarrin@apple.com>

        Unreviewed.

        Use new wkCACFLayerGetContextUserData function

        * platform/graphics/ca/win/PlatformCALayerWin.cpp:

2011-01-07  Chris Marrin  <cmarrin@apple.com>

        Unreviewed.

        Minor change to check for null context

        * win/lib/WebKitSystemInterface.lib:
        * win/lib/WebKitSystemInterface_debug.lib:



git-svn-id: svn://svn.chromium.org/blink/trunk@75280 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2011-01-07  Chris Marrin  <cmarrin@apple.com>
+
+        Unreviewed.
+
+        Use new wkCACFLayerGetContextUserData function
+
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+
 2011-01-07  James Robinson  <jamesr@chromium.org>
 
         Fix compile bustage due to bad merge in 75276.

third_party/WebKit/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)

third_party/WebKit/WebKitLibraries/ChangeLog

+2011-01-07  Chris Marrin  <cmarrin@apple.com>
+
+        Unreviewed.
+
+        Minor change to check for null context
+
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
 2011-01-07  Chris Marrin  <cmarrin@apple.com>
 
         Unreviewed.