Remove uses of CACFContextRef and CARender* from WebCore

[WebKit-https.git] / WebCore / platform / graphics / win / WKCACFLayerRenderer.h

diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.h b/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
index 1d73b9933a1d265fdf7f047302840888b0e7f382..763fffaa9d048ecabef9283805247042c99e2ef7 100644 (file)
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
@@ -41,9 +41,7 @@
 #include <CoreGraphics/CGGeometry.h>
 
 interface IDirect3DDevice9;
 #include <CoreGraphics/CGGeometry.h>
 
 interface IDirect3DDevice9;

-typedef struct _CACFContext* CACFContextRef;
-typedef struct _CARenderContext CARenderContext;
-typedef struct _CARenderOGLContext CARenderOGLContext;
+struct WKCACFContext;

 
 namespace WebCore {
 
 
 namespace WebCore {
 


@@ -64,7 +62,7 @@ public:
     ~WKCACFLayerRenderer();
 
     static bool acceleratedCompositingAvailable();
     ~WKCACFLayerRenderer();
 
     static bool acceleratedCompositingAvailable();

-    static void didFlushContext(CACFContextRef);
+    static void didFlushContext(WKCACFContext*);

 
     void setRootContents(CGImageRef);
     void setRootContentsAndDisplay(CGImageRef);
 
     void setRootContents(CGImageRef);
     void setRootContentsAndDisplay(CGImageRef);


@@ -104,9 +102,7 @@ private:
     COMPtr<IDirect3DDevice9> m_d3dDevice;
     RefPtr<WKCACFRootLayer> m_rootLayer;
     RefPtr<WKCACFLayer> m_rootChildLayer;
     COMPtr<IDirect3DDevice9> m_d3dDevice;
     RefPtr<WKCACFRootLayer> m_rootLayer;
     RefPtr<WKCACFLayer> m_rootChildLayer;

-    RetainPtr<CACFContextRef> m_context;
-    CARenderContext* m_renderContext;
-    CARenderOGLContext* m_renderer;
+    WKCACFContext* m_context;

     HWND m_hostWindow;
     Timer<WKCACFLayerRenderer> m_renderTimer;
     bool m_backingStoreDirty;
     HWND m_hostWindow;
     Timer<WKCACFLayerRenderer> m_renderTimer;
     bool m_backingStoreDirty;