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

cmarrin at apple.com cmarrin at apple.com
Fri Jan 21 15:08:24 UTC 2011


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

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 7346153..8c5272d 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+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:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
 2011-01-05  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 56b93d5..15ac6ba 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -145,6 +145,10 @@ void wkCACFContextSetLayer(WKCACFContext*, CACFLayerRef);
 void wkCACFContextFlush(WKCACFContext*);
 
 CFTimeInterval wkCACFContextGetLastCommitTime(WKCACFContext*);
+CFTimeInterval wkCACFContextGetNextUpdateTime(WKCACFContext*);
+
+void* wkCACFContextGetUserData(WKCACFContext*);
+void wkCACFContextSetUserData(WKCACFContext*, void*);
 
 void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*);
 void wkCACFContextReleaseD3DResources(WKCACFContext*);
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 6c82647..b2c0e06 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 f0257a0..a4b8899 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list