[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 699c679fdcd2a7827f53f9ae928233c320a6e944
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 22:19:26 2011 +0000

    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.
    
            * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
            * win/lib/WebKitSystemInterface.lib:
            * win/lib/WebKitSystemInterface_debug.lib:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 8c5272d..7eca53e 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -2,6 +2,17 @@
 
         Unreviewed.
 
+        Added one more API to WKSI to get the user data
+        out of the CACFContext.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
+2011-01-07  Chris Marrin  <cmarrin at apple.com>
+
+        Unreviewed.
+
         Adding updated WKSI files missed in http://trac.webkit.org/changeset/75262
 
         * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 15ac6ba..564d4e8 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -150,6 +150,8 @@ CFTimeInterval wkCACFContextGetNextUpdateTime(WKCACFContext*);
 void* wkCACFContextGetUserData(WKCACFContext*);
 void wkCACFContextSetUserData(WKCACFContext*, void*);
 
+void* wkCACFLayerGetContextUserData(CACFLayerRef);
+
 void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*);
 void wkCACFContextReleaseD3DResources(WKCACFContext*);
 
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index b2c0e06..683cd05 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 a4b8899..ce7731f 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ

-- 
WebKit Debian packaging