Changeset 195979 in webkit

Timestamp:

Feb 1, 2016, 2:07:06 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/IOSurface.mm (modified) (2 diffs)
• platform/spi/cg/CoreGraphicsSPI.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

@@ -29 +29 @@
 #if USE(IOSURFACE)
 
+#import "CoreGraphicsSPI.h"
 #import "GraphicsContextCG.h"
 #import "IOSurfacePool.h"
@@ -36 +37 @@
 #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)

trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h

@@ -30 +30 @@
 #include <CoreGraphics/CoreGraphics.h>
 
+#if USE(IOSURFACE)
+#include "IOSurfaceSPI.h"
+#endif
+
 #if USE(APPLE_INTERNAL_SDK)
 
@@ -36 +40 @@
 
 #else
+
 struct CGFontHMetrics {
     int ascent;
@@ -166 +171 @@
 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);