Move some SPI declarations into the appropriate SPI header
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Feb 2016 22:07:06 +0000 (22:07 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Feb 2016 22:07:06 +0000 (22:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153755

Reviewed by Darin Adler.

* platform/graphics/cocoa/IOSurface.mm:
* platform/spi/cg/CoreGraphicsSPI.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cocoa/IOSurface.mm
Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h

index 4a744b8..50cece2 100644 (file)
@@ -1,5 +1,15 @@
 2016-02-01  Tim Horton  <timothy_horton@apple.com>
 
+        Move some SPI declarations into the appropriate SPI header
+        https://bugs.webkit.org/show_bug.cgi?id=153755
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/cocoa/IOSurface.mm:
+        * platform/spi/cg/CoreGraphicsSPI.h:
+
+2016-02-01  Tim Horton  <timothy_horton@apple.com>
+
         Snapshot surfaces are forever wired after being compressed
         https://bugs.webkit.org/show_bug.cgi?id=153751
         <rdar://problem/24354546>
index 26cca82..9fa6f23 100644 (file)
@@ -28,6 +28,7 @@
 
 #if USE(IOSURFACE)
 
+#import "CoreGraphicsSPI.h"
 #import "GraphicsContextCG.h"
 #import "IOSurfacePool.h"
 #import "IOSurfaceSPI.h"
 #import "MachSendRight.h"
 #import <wtf/Assertions.h>
 
-extern "C" {
-CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
-CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
-CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
-}
-
 #if PLATFORM(IOS)
 // Move this into the SPI header once it's possible to put inside the APPLE_INTERNAL_SDK block.
 NSString * const WebIOSurfaceAcceleratorUnwireSurfaceKey = @"UnwireSurface";
index 8557637..b9e224c 100644 (file)
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreGraphics/CoreGraphics.h>
 
+#if USE(IOSURFACE)
+#include "IOSurfaceSPI.h"
+#endif
+
 #if USE(APPLE_INTERNAL_SDK)
 
 #include <CoreGraphics/CGFontCache.h>
 #include <CoreGraphics/CoreGraphicsPrivate.h>
 
 #else
+
 struct CGFontHMetrics {
     int ascent;
     int descent;
@@ -165,6 +170,12 @@ CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
 CGFontAntialiasingStyle CGContextGetFontAntialiasingStyle(CGContextRef);
 void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
 
+#if USE(IOSURFACE)
+CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
+CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
+CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
+#endif
+
 #if PLATFORM(COCOA)
 CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
 CGRect* CGSNextRect(const CGSRegionEnumeratorObj);