2011-01-07 Chris Marrin <cmarrin@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 8c5272d5b1062f94dc98b690b28c90f944fa8984..7eca53ec5f575af0eb71ef199cabab64759e5c2e 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-07  Chris Marrin  <cmarrin@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:
+
 2011-01-07  Chris Marrin  <cmarrin@apple.com>
 
         Unreviewed.

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 15ac6bab6a8332971d5447b9a5a1a5abec0c0b0a..564d4e8798befc24e966cf3f1b9cf99ab1dcaa82 100644 (file)
--- 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 b2c0e0617acb3ec8ebf5f0a5485793dc34121071..683cd054d4eb478efae287754045779f7f7723c1 100644 (file)
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 a4b8899f81a78e948fc8e9cb2c9b9e20e7afb4f0..ce7731f5424e39999ca8300a435cc613f802ed36 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ