Changeset 82608 in webkit

Timestamp:

Mar 31, 2011 1:05:05 PM (13 years ago)

Author:

Adam Roben

Message:

Update WKCACFViewLayerTreeHost for changes to WKCACFView API

This should not result in any change in behavior.

Fixes <​http://webkit.org/b/57560> WKCACFViewLayerTreeHost needs to tell WKCACFView where to
render

Reviewed by Darin Adler.

• platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp: Updated API declarations.

(WebCore::WKCACFViewLayerTreeHost::WKCACFViewLayerTreeHost): Tell WKCACFView it should
render into the window we give it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-31  Adam Roben  <aroben@apple.com>
+
+        Update WKCACFViewLayerTreeHost for changes to WKCACFView API
+
+        This should not result in any change in behavior.
+
+        Fixes <http://webkit.org/b/57560> WKCACFViewLayerTreeHost needs to tell WKCACFView where to
+        render
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp: Updated API declarations.
+        (WebCore::WKCACFViewLayerTreeHost::WKCACFViewLayerTreeHost): Tell WKCACFView it should
+        render into the window we give it.
+
 2011-03-31  Marius Storm-Olsen  <marius.storm-olsen@nokia.com>
 

trunk/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp

@@ -43 +43 @@
 #endif
 
-SOFT_LINK(WebKitQuartzCoreAdditions, WKCACFViewCreate, WKCACFViewRef, __cdecl, (), ())
+enum WKCACFViewDrawingDestination {
+    kWKCACFViewDrawingDestinationWindow = 0,
+    kWKCACFViewDrawingDestinationImage,
+};
+typedef enum WKCACFViewDrawingDestination WKCACFViewDrawingDestination;
+
+SOFT_LINK(WebKitQuartzCoreAdditions, WKCACFViewCreate, WKCACFViewRef, __cdecl, (WKCACFViewDrawingDestination destination), (destination))
 SOFT_LINK(WebKitQuartzCoreAdditions, WKCACFViewSetLayer, void, __cdecl, (WKCACFViewRef view, CACFLayerRef layer), (view, layer))
 SOFT_LINK(WebKitQuartzCoreAdditions, WKCACFViewUpdate, void, __cdecl, (WKCACFViewRef view, HWND window, const CGRect* bounds), (view, window, bounds))
@@ -64 +70 @@
 
 WKCACFViewLayerTreeHost::WKCACFViewLayerTreeHost()
-    : m_view(AdoptCF, WKCACFViewCreate())
+    : m_view(AdoptCF, WKCACFViewCreate(kWKCACFViewDrawingDestinationWindow))
     , m_viewNeedsUpdate(true)
 {