Title: [198697] trunk/Source
- Revision
- 198697
- Author
- [email protected]
- Date
- 2016-03-25 16:15:03 -0700 (Fri, 25 Mar 2016)
Log Message
Remove use of extern "C" to include QuartzCore files
https://bugs.webkit.org/show_bug.cgi?id=155905
Source/WebCore:
<rdar://problem/25364798>
Reviewed by Anders Carlson.
We can avoid having to wrap constants in extern "C", since they
are mangled the same in both C and C++.
* platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm: Now that
QuartzCoreSPI.h has CABackdropLayer, remove the duplicate entry.
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: Ditto.
* platform/spi/cocoa/QuartzCoreSPI.h: Include the framework private
file. Repace EXTERN_C with "extern".
Source/WebKit2:
Reviewed by Anders Carlson.
We can avoid having to wrap constants in extern "C", since they
are mangled the same in both C and C++.
* UIProcess/mac/RemoteLayerTreeHost.mm: Remove the
mention of CABackdropLayer.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (198696 => 198697)
--- trunk/Source/WebCore/ChangeLog 2016-03-25 23:06:06 UTC (rev 198696)
+++ trunk/Source/WebCore/ChangeLog 2016-03-25 23:15:03 UTC (rev 198697)
@@ -1,3 +1,20 @@
+2016-03-25 Dean Jackson <[email protected]>
+
+ Remove use of extern "C" to include QuartzCore files
+ https://bugs.webkit.org/show_bug.cgi?id=155905
+ <rdar://problem/25364798>
+
+ Reviewed by Anders Carlson.
+
+ We can avoid having to wrap constants in extern "C", since they
+ are mangled the same in both C and C++.
+
+ * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm: Now that
+ QuartzCoreSPI.h has CABackdropLayer, remove the duplicate entry.
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: Ditto.
+ * platform/spi/cocoa/QuartzCoreSPI.h: Include the framework private
+ file. Repace EXTERN_C with "extern".
+
2016-03-25 Alex Christensen <[email protected]>
Add a compile time flag for using QTKit
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm (198696 => 198697)
--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm 2016-03-25 23:06:06 UTC (rev 198696)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm 2016-03-25 23:15:03 UTC (rev 198697)
@@ -33,11 +33,6 @@
#import "QuartzCoreSPI.h"
#import <QuartzCore/QuartzCore.h>
-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@end
-#endif
-
using namespace WebCore;
// FIXME: Should share these values with FilterEffectRenderer::build() (https://bugs.webkit.org/show_bug.cgi?id=76008).
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (198696 => 198697)
--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-03-25 23:06:06 UTC (rev 198696)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-03-25 23:15:03 UTC (rev 198697)
@@ -59,12 +59,6 @@
#import "ThemeMac.h"
#endif
-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@property BOOL windowServerAware;
-@end
-#endif
-
#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
#else
Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (198696 => 198697)
--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-03-25 23:06:06 UTC (rev 198696)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-03-25 23:15:03 UTC (rev 198697)
@@ -32,29 +32,15 @@
#include <QuartzCore/CARenderServer.h>
#ifdef __OBJC__
+
#import <QuartzCore/CALayerHost.h>
#import <QuartzCore/CALayerPrivate.h>
+#import <QuartzCore/QuartzCorePrivate.h>
#if PLATFORM(IOS)
#import <QuartzCore/CADisplay.h>
#endif
-// FIXME: As a workaround for <rdar://problem/18985152>, we conditionally enclose the following
-// headers in an extern "C" linkage block to make it suitable for Objective-C++ use. Once this
-// bug has been fixed we can simply include header <QuartzCore/QuartzCorePrivate.h> instead of
-// including specific QuartzCore headers.
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#import <QuartzCore/CAContext.h>
-#import <QuartzCore/CAFilter.h>
-#import <QuartzCore/CATiledLayerPrivate.h>
-#import <QuartzCore/CATransactionPrivate.h>
-
-#ifdef __cplusplus
-}
-#endif
#endif // __OBJC__
#else
@@ -109,6 +95,12 @@
@end
#endif
+#if ENABLE(FILTERS_LEVEL_2)
+@interface CABackdropLayer : CALayer
+@property BOOL windowServerAware;
+@end
+#endif
+
struct CAColorMatrix {
float m11, m12, m13, m14, m15;
float m21, m22, m23, m24, m25;
@@ -166,33 +158,33 @@
#endif
@end
-EXTERN_C NSString * const kCATiledLayerRemoveImmediately;
+extern NSString * const kCATiledLayerRemoveImmediately;
-EXTERN_C NSString * const kCAFilterColorInvert;
-EXTERN_C NSString * const kCAFilterColorMatrix;
-EXTERN_C NSString * const kCAFilterColorMonochrome;
-EXTERN_C NSString * const kCAFilterColorHueRotate;
-EXTERN_C NSString * const kCAFilterColorSaturate;
-EXTERN_C NSString * const kCAFilterGaussianBlur;
-EXTERN_C NSString * const kCAFilterPlusD;
-EXTERN_C NSString * const kCAFilterPlusL;
+extern NSString * const kCAFilterColorInvert;
+extern NSString * const kCAFilterColorMatrix;
+extern NSString * const kCAFilterColorMonochrome;
+extern NSString * const kCAFilterColorHueRotate;
+extern NSString * const kCAFilterColorSaturate;
+extern NSString * const kCAFilterGaussianBlur;
+extern NSString * const kCAFilterPlusD;
+extern NSString * const kCAFilterPlusL;
-EXTERN_C NSString * const kCAFilterNormalBlendMode;
-EXTERN_C NSString * const kCAFilterMultiplyBlendMode;
-EXTERN_C NSString * const kCAFilterScreenBlendMode;
-EXTERN_C NSString * const kCAFilterOverlayBlendMode;
-EXTERN_C NSString * const kCAFilterDarkenBlendMode;
-EXTERN_C NSString * const kCAFilterLightenBlendMode;
-EXTERN_C NSString * const kCAFilterColorDodgeBlendMode;
-EXTERN_C NSString * const kCAFilterColorBurnBlendMode;
-EXTERN_C NSString * const kCAFilterSoftLightBlendMode;
-EXTERN_C NSString * const kCAFilterHardLightBlendMode;
-EXTERN_C NSString * const kCAFilterDifferenceBlendMode;
-EXTERN_C NSString * const kCAFilterExclusionBlendMode;
+extern NSString * const kCAFilterNormalBlendMode;
+extern NSString * const kCAFilterMultiplyBlendMode;
+extern NSString * const kCAFilterScreenBlendMode;
+extern NSString * const kCAFilterOverlayBlendMode;
+extern NSString * const kCAFilterDarkenBlendMode;
+extern NSString * const kCAFilterLightenBlendMode;
+extern NSString * const kCAFilterColorDodgeBlendMode;
+extern NSString * const kCAFilterColorBurnBlendMode;
+extern NSString * const kCAFilterSoftLightBlendMode;
+extern NSString * const kCAFilterHardLightBlendMode;
+extern NSString * const kCAFilterDifferenceBlendMode;
+extern NSString * const kCAFilterExclusionBlendMode;
-EXTERN_C NSString * const kCAContextDisplayName;
-EXTERN_C NSString * const kCAContextDisplayId;
-EXTERN_C NSString * const kCAContextIgnoresHitTest;
+extern NSString * const kCAContextDisplayName;
+extern NSString * const kCAContextDisplayId;
+extern NSString * const kCAContextIgnoresHitTest;
#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 100000) \
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 30000) \
Modified: trunk/Source/WebKit2/ChangeLog (198696 => 198697)
--- trunk/Source/WebKit2/ChangeLog 2016-03-25 23:06:06 UTC (rev 198696)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-25 23:15:03 UTC (rev 198697)
@@ -1,3 +1,16 @@
+2016-03-25 Dean Jackson <[email protected]>
+
+ Remove use of extern "C" to include QuartzCore files
+ https://bugs.webkit.org/show_bug.cgi?id=155905
+
+ Reviewed by Anders Carlson.
+
+ We can avoid having to wrap constants in extern "C", since they
+ are mangled the same in both C and C++.
+
+ * UIProcess/mac/RemoteLayerTreeHost.mm: Remove the
+ mention of CABackdropLayer.
+
2016-03-25 Brian Burg <[email protected]>
Web Inspector: protocol generator should prefix C++ filenames with the protocol group
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (198696 => 198697)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2016-03-25 23:06:06 UTC (rev 198696)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2016-03-25 23:15:03 UTC (rev 198697)
@@ -41,11 +41,6 @@
#import <UIKit/UIView.h>
#endif
-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@end
-#endif
-
using namespace WebCore;
namespace WebKit {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
