Title: [195979] trunk/Source/WebCore
- Revision
- 195979
- Author
- [email protected]
- Date
- 2016-02-01 14:07:06 -0800 (Mon, 01 Feb 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195978 => 195979)
--- trunk/Source/WebCore/ChangeLog 2016-02-01 21:50:27 UTC (rev 195978)
+++ trunk/Source/WebCore/ChangeLog 2016-02-01 22:07:06 UTC (rev 195979)
@@ -1,5 +1,15 @@
2016-02-01 Tim Horton <[email protected]>
+ 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 <[email protected]>
+
Snapshot surfaces are forever wired after being compressed
https://bugs.webkit.org/show_bug.cgi?id=153751
<rdar://problem/24354546>
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (195978 => 195979)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-02-01 21:50:27 UTC (rev 195978)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-02-01 22:07:06 UTC (rev 195979)
@@ -28,6 +28,7 @@
#if USE(IOSURFACE)
+#import "CoreGraphicsSPI.h"
#import "GraphicsContextCG.h"
#import "IOSurfacePool.h"
#import "IOSurfaceSPI.h"
@@ -36,12 +37,6 @@
#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";
Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (195978 => 195979)
--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2016-02-01 21:50:27 UTC (rev 195978)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2016-02-01 22:07:06 UTC (rev 195979)
@@ -29,12 +29,17 @@
#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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
