2011-01-07 Chris Marrin <cmarrin@apple.com>
authorcmarrin@apple.com <cmarrin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Jan 2011 23:07:44 +0000 (23:07 +0000)
committercmarrin@apple.com <cmarrin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Jan 2011 23:07:44 +0000 (23:07 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@75280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
WebKitLibraries/ChangeLog
WebKitLibraries/win/lib/WebKitSystemInterface.lib
WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib

index 1307a05..d627c43 100644 (file)
@@ -1,3 +1,11 @@
+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.
index 982b5f6..919c3b3 100644 (file)
@@ -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)
index 7eca53e..9d9d930 100644 (file)
@@ -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@apple.com>
+
+        Unreviewed.
+
         Added one more API to WKSI to get the user data
         out of the CACFContext.
 
index 683cd05..a649d73 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ
index ce7731f..f21c19a 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ