Roll our r64361 and r64363
[WebKit-https.git] / WebCore / platform / graphics / win / WKCACFLayer.cpp
index 416c497529da4e6a1bb870030e821151353fab61..b5f342748c4d02b7f2d605348f64b0ea3a94be8c 100644 (file)
 #include "WKCACFLayer.h"
 
 #include "WKCACFLayerRenderer.h"
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#include <wtf/text/CString.h>
+
 #include <stdio.h>
+#include <QuartzCore/CACFContext.h>
+#include <QuartzCore/CARender.h>
+
+#ifndef NDEBUG
 #include <wtf/CurrentTime.h>
-#include <wtf/text/CString.h>
+#endif
 
 namespace WebCore {
 
@@ -160,9 +165,9 @@ WKCACFLayer::~WKCACFLayer()
     CACFLayerSetDisplayCallback(layer(), 0);
 }
 
-void WKCACFLayer::becomeRootLayerForContext(WKCACFContext* context)
+void WKCACFLayer::becomeRootLayerForContext(CACFContextRef context)
 {
-    wkCACFContextSetLayer(context, layer());
+    CACFContextSetLayer(context, layer());
     setNeedsCommit();
 }