<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198697] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198697">198697</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-03-25 16:15:03 -0700 (Fri, 25 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCAFiltersCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198696 => 198697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-25 Dean Jackson <dino@apple.com>
+
+ 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".
+
</ins><span class="cx"> 2016-03-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add a compile time flag for using QTKit
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCAFiltersCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm (198696 => 198697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,11 +33,6 @@
</span><span class="cx"> #import "QuartzCoreSPI.h"
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@end
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> // FIXME: Should share these values with FilterEffectRenderer::build() (https://bugs.webkit.org/show_bug.cgi?id=76008).
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (198696 => 198697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,12 +59,6 @@
</span><span class="cx"> #import "ThemeMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@property BOOL windowServerAware;
-@end
-#endif
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <WebKitAdditions/LayerBackingStoreAdditions.mm>
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (198696 => 198697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,29 +32,15 @@
</span><span class="cx"> #include <QuartzCore/CARenderServer.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><ins>+
</ins><span class="cx"> #import <QuartzCore/CALayerHost.h>
</span><span class="cx"> #import <QuartzCore/CALayerPrivate.h>
</span><ins>+#import <QuartzCore/QuartzCorePrivate.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <QuartzCore/CADisplay.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// 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
</del><span class="cx"> #endif // __OBJC__
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="lines">@@ -109,6 +95,12 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+@interface CABackdropLayer : CALayer
+@property BOOL windowServerAware;
+@end
+#endif
+
</ins><span class="cx"> struct CAColorMatrix {
</span><span class="cx"> float m11, m12, m13, m14, m15;
</span><span class="cx"> float m21, m22, m23, m24, m25;
</span><span class="lines">@@ -166,33 +158,33 @@
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-EXTERN_C NSString * const kCATiledLayerRemoveImmediately;
</del><ins>+extern NSString * const kCATiledLayerRemoveImmediately;
</ins><span class="cx">
</span><del>-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;
</del><ins>+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;
</ins><span class="cx">
</span><del>-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;
</del><ins>+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;
</ins><span class="cx">
</span><del>-EXTERN_C NSString * const kCAContextDisplayName;
-EXTERN_C NSString * const kCAContextDisplayId;
-EXTERN_C NSString * const kCAContextIgnoresHitTest;
</del><ins>+extern NSString * const kCAContextDisplayName;
+extern NSString * const kCAContextDisplayId;
+extern NSString * const kCAContextIgnoresHitTest;
</ins><span class="cx">
</span><span class="cx"> #if (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 100000) \
</span><span class="cx"> || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 30000) \
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198696 => 198697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-25 Dean Jackson <dino@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-03-25 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: protocol generator should prefix C++ filenames with the protocol group
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (198696 => 198697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,11 +41,6 @@
</span><span class="cx"> #import <UIKit/UIView.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@end
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre>
</div>
</div>
</body>
</html>