From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 13 May 2011 16:23:25 +0100 Subject: Merge WebKit at r75993: Initial merge by git. Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3 --- WebKitLibraries/ChangeLog | 11 +++++++++++ .../WebKitSystemInterface/WebKitSystemInterface.h | 2 +- WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 555936 -> 556678 bytes 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 9d9d930..ca243f4 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,14 @@ +2011-01-17 Adam Roben + + Make it possible to both set and clear a wkCACFContext's D3D device + + Fixes WKCACFLayerRenderer is hard to use + + Reviewed by Chris Marrin. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + 2011-01-07 Chris Marrin Unreviewed. diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 564d4e8..744f80b 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -152,7 +152,7 @@ void wkCACFContextSetUserData(WKCACFContext*, void*); void* wkCACFLayerGetContextUserData(CACFLayerRef); -void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*); +void wkCACFContextSetD3DDevice(WKCACFContext*, IDirect3DDevice9*); void wkCACFContextReleaseD3DResources(WKCACFContext*); bool wkCACFContextBeginUpdate(WKCACFContext*, void* buffer, size_t bufferSize, CFTimeInterval time, const CGRect& bounds, const CGRect dirtyRects[], size_t dirtyRectCount); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index a649d73..f1af3b0 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ -- cgit v1.1