<!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>[176204] 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/176204">176204</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-17 09:44:43 -0800 (Mon, 17 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] QuartzCore SPI not available in public SDK
https://bugs.webkit.org/show_bug.cgi?id=138751
Reviewed by David Kilzer.
Source/WebCore:
Add a SPI wrapper header called QuartzCoreSPI.h that forward declares
QuartzCore SPI and use this header instead of including private headers
of QuartzCore directly.
* WebCore.xcodeproj/project.pbxproj: Added private header QuartzCoreSPI.h.
* platform/graphics/ca/mac/PlatformCAFiltersMac.h: Removed; incorporated its
functionality into QuartzCoreSPI.h.
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm: Substitute header
QuartzCoreSPI.h for PlatformCAFiltersMac.h as the content of the latter
was incorporated into the former.
* platform/graphics/ca/mac/PlatformCALayerMac.mm: Move CALayer and CATiledLayer
forward declarations from this file to file QuartzCoreSPI.h and include
header QuartzCoreSPI.h instead of including CATiledLayerPrivate.h directly. Also
remove header PlatformCAFiltersMac.h as its content is incorporated into QuartzCoreSPI.h
* platform/ios/LegacyTileCache.mm: Include headers CoreGraphicsSPI.h and QuartzCoreSPI.h
instead of including QuartzCore headers directly.
* platform/ios/LegacyTileGrid.mm: Include header QuartzCoreSPI.h instead
of including QuartzCore headers directly. Also sort the list of #include directives.
* platform/ios/LegacyTileGridTile.mm: Include header QuartzCoreSPI.h
instead of including QuartzCore headers directly.
* platform/spi/cocoa/QuartzCoreSPI.h: Added.
Source/WebKit/mac:
Include header QuartzCoreSPI.h instead of including QuartzCore headers directly.
* WebInspector/WebNodeHighlight.mm:
* WebView/WebIndicateLayer.mm:
Source/WebKit2:
* Shared/mac/RemoteLayerBackingStore.mm: Move CALayer forward declaration
from this file to file QuartzCoreSPI.h and include header QuartzCoreSPI.h.
* Shared/mac/RemoteLayerTreePropertyApplier.mm: Ditto.
* UIProcess/API/Cocoa/WKWebView.mm: Include header QuartzCoreSPI.h instead
of including QuartzCore headers directly.
* UIProcess/ios/ViewGestureControllerIOS.mm: Ditto.
* UIProcess/ios/WKContentView.mm: Ditto.
* UIProcess/ios/WKPDFPageNumberIndicator.mm: Ditto.
* UIProcess/mac/ViewGestureControllerMac.mm: Move CAFilter forward declarations
from this file to fileQuartzCoreSPI.h and include header QuartzCoreSPI.h.
Also sort the list of #import directives.
* UIProcess/mac/ViewSnapshotStore.mm: Include header QuartzCoreSPI.h
instead of including QuartzCore headers directly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridmm">trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridTilemm">trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebNodeHighlightmm">trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebIndicateLayermm">trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKPDFPageNumberIndicatormm">trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewSnapshotStoremm">trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMach">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/ChangeLog 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-11-17 Daniel Bates <dabates@apple.com>
+
+ [iOS] QuartzCore SPI not available in public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=138751
+
+ Reviewed by David Kilzer.
+
+ Add a SPI wrapper header called QuartzCoreSPI.h that forward declares
+ QuartzCore SPI and use this header instead of including private headers
+ of QuartzCore directly.
+
+ * WebCore.xcodeproj/project.pbxproj: Added private header QuartzCoreSPI.h.
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.h: Removed; incorporated its
+ functionality into QuartzCoreSPI.h.
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.mm: Substitute header
+ QuartzCoreSPI.h for PlatformCAFiltersMac.h as the content of the latter
+ was incorporated into the former.
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm: Move CALayer and CATiledLayer
+ forward declarations from this file to file QuartzCoreSPI.h and include
+ header QuartzCoreSPI.h instead of including CATiledLayerPrivate.h directly. Also
+ remove header PlatformCAFiltersMac.h as its content is incorporated into QuartzCoreSPI.h
+ * platform/ios/LegacyTileCache.mm: Include headers CoreGraphicsSPI.h and QuartzCoreSPI.h
+ instead of including QuartzCore headers directly.
+ * platform/ios/LegacyTileGrid.mm: Include header QuartzCoreSPI.h instead
+ of including QuartzCore headers directly. Also sort the list of #include directives.
+ * platform/ios/LegacyTileGridTile.mm: Include header QuartzCoreSPI.h
+ instead of including QuartzCore headers directly.
+ * platform/spi/cocoa/QuartzCoreSPI.h: Added.
+
</ins><span class="cx"> 2014-11-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move more CSS properties to the new StyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -5748,6 +5748,7 @@
</span><span class="cx"> CE1252371A15BDBE00864480 /* CoreGraphicsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = C24685131A148E1800811792 /* CoreGraphicsSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252381A166FA000864480 /* QuickLookSPI.h */; };
</span><span class="cx"> CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523A1A16711000864480 /* NSFileManagerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */; };
</span><span class="cx"> CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -5823,7 +5824,6 @@
</span><span class="cx"> D6489D26166FFCF1007C031B /* JSHTMLTemplateElement.h in Headers */ = {isa = PBXBuildFile; fileRef = D6489D24166FFCF1007C031B /* JSHTMLTemplateElement.h */; };
</span><span class="cx"> D66817FA166FE6D700FA07B4 /* HTMLTemplateElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6EFC0BB1666DF7A003D291E /* HTMLTemplateElement.cpp */; };
</span><span class="cx"> D66817FB166FE6D700FA07B4 /* HTMLTemplateElement.h in Headers */ = {isa = PBXBuildFile; fileRef = D6EFC0BC1666DF7A003D291E /* HTMLTemplateElement.h */; };
</span><del>- D66B2D5C186830050073C4DD /* PlatformCAFiltersMac.h in Headers */ = {isa = PBXBuildFile; fileRef = D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */; };
</del><span class="cx"> D6E276AF14637455001D280A /* MutationObserverRegistration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */; };
</span><span class="cx"> D6E276B014637455001D280A /* MutationObserverRegistration.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E276AE14637455001D280A /* MutationObserverRegistration.h */; };
</span><span class="cx"> D6E528A3149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */; };
</span><span class="lines">@@ -13232,6 +13232,7 @@
</span><span class="cx"> CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextController.h; sourceTree = "<group>"; };
</span><span class="cx"> CE1252381A166FA000864480 /* QuickLookSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuickLookSPI.h; path = ios/QuickLookSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12523A1A16711000864480 /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerSPI.h; sourceTree = "<group>"; };
</span><ins>+ CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuartzCoreSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> CE5CB1B314EDAB6F00BB2795 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
</span><span class="cx"> CE6D89294C7AACE0AD89B3DD /* MathMLMencloseElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLMencloseElement.h; sourceTree = "<group>"; };
</span><span class="cx"> CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextUIController.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13311,7 +13312,6 @@
</span><span class="cx"> D619A306144E00BE004BC302 /* ChildListMutationScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildListMutationScope.h; sourceTree = "<group>"; };
</span><span class="cx"> D6489D23166FFCF1007C031B /* JSHTMLTemplateElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTemplateElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> D6489D24166FFCF1007C031B /* JSHTMLTemplateElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLTemplateElement.h; sourceTree = "<group>"; };
</span><del>- D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAFiltersMac.h; path = ca/mac/PlatformCAFiltersMac.h; sourceTree = "<group>"; };
</del><span class="cx"> D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverRegistration.cpp; sourceTree = "<group>"; };
</span><span class="cx"> D6E276AE14637455001D280A /* MutationObserverRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutationObserverRegistration.h; sourceTree = "<group>"; };
</span><span class="cx"> D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverInterestGroup.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15851,7 +15851,6 @@
</span><span class="cx"> 2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */,
</span><span class="cx"> 0F5E200518E771FC003EC3E5 /* PlatformCAAnimationMac.h */,
</span><span class="cx"> 4958781F12A57DDF007238AC /* PlatformCAAnimationMac.mm */,
</span><del>- D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */,
</del><span class="cx"> 0F13163F16ED0CDE0035CC04 /* PlatformCAFiltersMac.mm */,
</span><span class="cx"> 2D70BA1218074DDF0001908A /* PlatformCALayerMac.h */,
</span><span class="cx"> 4958782012A57DDF007238AC /* PlatformCALayerMac.mm */,
</span><span class="lines">@@ -16202,6 +16201,7 @@
</span><span class="cx"> 2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */,
</span><span class="cx"> 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */,
</span><span class="cx"> CE12523A1A16711000864480 /* NSFileManagerSPI.h */,
</span><ins>+ CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -25546,7 +25546,6 @@
</span><span class="cx"> 499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */,
</span><span class="cx"> 0F5E200618E771FC003EC3E5 /* PlatformCAAnimationMac.h in Headers */,
</span><span class="cx"> 0F13163E16ED0CC80035CC04 /* PlatformCAFilters.h in Headers */,
</span><del>- D66B2D5C186830050073C4DD /* PlatformCAFiltersMac.h in Headers */,
</del><span class="cx"> 499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */,
</span><span class="cx"> 493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */,
</span><span class="cx"> 2D70BA1318074DDF0001908A /* PlatformCALayerMac.h in Headers */,
</span><span class="lines">@@ -25619,6 +25618,7 @@
</span><span class="cx"> 0081FF0016B0A2D3008AAA7A /* PublicSuffix.h in Headers */,
</span><span class="cx"> 10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */,
</span><span class="cx"> 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
</span><ins>+ CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */,
</ins><span class="cx"> 442AF7A9102CDDEA008FD4D3 /* QuickLook.h in Headers */,
</span><span class="cx"> CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */,
</span><span class="cx"> A10DBF4718F92317000D70C6 /* QuickLookHandleClient.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMach"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.h 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlatformCAFiltersMac_h
-#define PlatformCAFiltersMac_h
-
-#if USE_CA_FILTERS
-struct CAColorMatrix {
- float m11, m12, m13, m14, m15;
- float m21, m22, m23, m24, m25;
- float m31, m32, m33, m34, m35;
- float m41, m42, m43, m44, m45;
-};
-
-typedef struct CAColorMatrix CAColorMatrix;
-
-@interface NSValue(Details)
-+ (NSValue *)valueWithCAColorMatrix:(CAColorMatrix)t;
-@end
-
-@interface CAFilter : NSObject <NSCopying, NSMutableCopying, NSCoding>
-@end
-
-@interface CAFilter(Details)
-@property(copy) NSString *name;
-+ (CAFilter *)filterWithType:(NSString *)type;
-@end
-
-extern NSString * const kCAFilterColorMatrix;
-extern NSString * const kCAFilterColorMonochrome;
-extern NSString * const kCAFilterColorHueRotate;
-extern NSString * const kCAFilterColorSaturate;
-extern NSString * const kCAFilterGaussianBlur;
-
-#if ENABLE(CSS_COMPOSITING)
-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;
-#endif // CSS_COMPOSITING
-
-#endif // CA_FILTERS
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="cx"> #import "LengthFunctions.h" // This is a layering violation.
</span><del>-#import "PlatformCAFiltersMac.h"
</del><span class="cx"> #import "PlatformCALayerMac.h"
</span><ins>+#import "QuartzCoreSPI.h"
</ins><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import "LengthFunctions.h"
</span><span class="cx"> #import "PlatformCAAnimationMac.h"
</span><span class="cx"> #import "PlatformCAFilters.h"
</span><del>-#import "PlatformCAFiltersMac.h"
</del><ins>+#import "QuartzCoreSPI.h"
</ins><span class="cx"> #import "ScrollbarThemeMac.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "TiledBacking.h"
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #import "WKGraphics.h"
</span><span class="cx"> #import "WebCoreThread.h"
</span><span class="cx"> #import "WebTiledLayer.h"
</span><del>-#import <QuartzCore/CATiledLayerPrivate.h>
</del><span class="cx"> #else
</span><span class="cx"> #import "ThemeMac.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -173,18 +172,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface CATiledLayer(GraphicsLayerCAPrivate)
-- (void)displayInRect:(CGRect)r levelOfDetail:(int)lod options:(NSDictionary *)dict;
-- (BOOL)canDrawConcurrently;
-- (void)setCanDrawConcurrently:(BOOL)flag;
-@end
-
-@interface CALayer(Private)
-- (void)setContentsChanged;
-- (void)setAcceleratesDrawing:(BOOL)flag;
-- (BOOL)acceleratesDrawing;
-@end
-
</del><span class="cx"> void PlatformCALayerMac::setOwner(PlatformCALayerClient* owner)
</span><span class="cx"> {
</span><span class="cx"> PlatformCALayer::setOwner(owner);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -28,19 +28,19 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#include "CoreGraphicsSPI.h"
</ins><span class="cx"> #include "LegacyTileGrid.h"
</span><span class="cx"> #include "LegacyTileGridTile.h"
</span><span class="cx"> #include "LegacyTileLayer.h"
</span><span class="cx"> #include "LegacyTileLayerPool.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MemoryPressureHandler.h"
</span><ins>+#include "QuartzCoreSPI.h"
</ins><span class="cx"> #include "SystemMemory.h"
</span><span class="cx"> #include "WAKWindow.h"
</span><span class="cx"> #include "WKGraphics.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #include "WebCoreThreadRun.h"
</span><del>-#include <QuartzCore/QuartzCore.h>
-#include <QuartzCore/QuartzCorePrivate.h>
</del><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> @interface WAKView (WebViewExtras)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -29,14 +29,13 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #include "CoreGraphicsSPI.h"
</span><del>-#include "MemoryPressureHandler.h"
-#include "SystemMemory.h"
</del><span class="cx"> #include "LegacyTileGridTile.h"
</span><span class="cx"> #include "LegacyTileLayer.h"
</span><span class="cx"> #include "LegacyTileLayerPool.h"
</span><ins>+#include "MemoryPressureHandler.h"
+#include "QuartzCoreSPI.h"
+#include "SystemMemory.h"
</ins><span class="cx"> #include "WAKWindow.h"
</span><del>-#include <QuartzCore/QuartzCore.h>
-#include <QuartzCore/QuartzCorePrivate.h>
</del><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <functional>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridTilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -33,9 +33,8 @@
</span><span class="cx"> #include "LegacyTileGrid.h"
</span><span class="cx"> #include "LegacyTileLayer.h"
</span><span class="cx"> #include "LegacyTileLayerPool.h"
</span><ins>+#include "QuartzCoreSPI.h"
</ins><span class="cx"> #include "WAKWindow.h"
</span><del>-#include <QuartzCore/QuartzCore.h>
-#include <QuartzCore/QuartzCorePrivate.h>
</del><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <functional>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (0 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -0,0 +1,128 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <QuartzCore/QuartzCore.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <QuartzCore/CAColorMatrix.h>
+
+#ifdef __OBJC__
+#import <QuartzCore/CALayerPrivate.h>
+
+// 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>
+
+#ifdef __cplusplus
+}
+#endif
+#endif // __OBJC__
+
+#else
+
+#ifdef __OBJC__
+@interface CALayer (Details)
+- (CAContext *)context;
+- (CGSize)size;
+- (void *)regionBeingDrawn;
+- (void)setContentsChanged;
+@property BOOL acceleratesDrawing;
+@property BOOL allowsGroupBlending;
+@property BOOL canDrawConcurrently;
+@property BOOL contentsOpaque;
+@property BOOL needsLayoutOnGeometryChange;
+@end
+
+@interface CATiledLayer (Details)
+- (void)displayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
+- (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
+@end
+
+struct CAColorMatrix {
+ float m11, m12, m13, m14, m15;
+ float m21, m22, m23, m24, m25;
+ float m31, m32, m33, m34, m35;
+ float m41, m42, m43, m44, m45;
+};
+typedef struct CAColorMatrix CAColorMatrix;
+
+@interface NSValue (CADetails)
++ (NSValue *)valueWithCAColorMatrix:(CAColorMatrix)t;
+@end
+
+@interface CAFilter : NSObject <NSCopying, NSMutableCopying, NSCoding>
+@end
+
+@interface CAFilter (Details)
++ (CAFilter *)filterWithType:(NSString *)type;
+@property (copy) NSString *name;
+@end
+
+@interface CAContext : NSObject
+@end
+
+@interface CAContext (Details)
++ (CAContext *)remoteContextWithOptions:(NSDictionary *)dict;
++ (id)objectForSlot:(uint32_t)name;
+- (uint32_t)createImageSlot:(CGSize)size hasAlpha:(BOOL)flag;
+- (void)deleteSlot:(uint32_t)name;
+@end
+#endif // __OBJC__
+
+#endif
+
+EXTERN_C 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 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_C NSString * const kCAContextDisplayName;
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-17 Daniel Bates <dabates@apple.com>
+
+ [iOS] QuartzCore SPI not available in public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=138751
+
+ Reviewed by David Kilzer.
+
+ Include header QuartzCoreSPI.h instead of including QuartzCore headers directly.
+
+ * WebInspector/WebNodeHighlight.mm:
+ * WebView/WebIndicateLayer.mm:
+
</ins><span class="cx"> 2014-11-17 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] allow host application to opt-out of alternate fullscreen
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebNodeHighlightmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #import "WebFramePrivate.h"
</span><span class="cx"> #import "WebHTMLView.h"
</span><span class="cx"> #import "WebView.h"
</span><del>-#import <QuartzCore/CALayerPrivate.h>
</del><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebIndicateLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx">
</span><span class="cx"> #import "WebFramePrivate.h"
</span><span class="cx"> #import "WebView.h"
</span><del>-#import <QuartzCore/CALayerPrivate.h>
</del><span class="cx"> #import <WebCore/ColorMac.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-17 Daniel Bates <dabates@apple.com>
+
+ [iOS] QuartzCore SPI not available in public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=138751
+
+ Reviewed by David Kilzer.
+
+ * Shared/mac/RemoteLayerBackingStore.mm: Move CALayer forward declaration
+ from this file to file QuartzCoreSPI.h and include header QuartzCoreSPI.h.
+ * Shared/mac/RemoteLayerTreePropertyApplier.mm: Ditto.
+ * UIProcess/API/Cocoa/WKWebView.mm: Include header QuartzCoreSPI.h instead
+ of including QuartzCore headers directly.
+ * UIProcess/ios/ViewGestureControllerIOS.mm: Ditto.
+ * UIProcess/ios/WKContentView.mm: Ditto.
+ * UIProcess/ios/WKPDFPageNumberIndicator.mm: Ditto.
+ * UIProcess/mac/ViewGestureControllerMac.mm: Move CAFilter forward declarations
+ from this file to fileQuartzCoreSPI.h and include header QuartzCoreSPI.h.
+ Also sort the list of #import directives.
+ * UIProcess/mac/ViewSnapshotStore.mm: Include header QuartzCoreSPI.h
+ instead of including QuartzCore headers directly.
+
</ins><span class="cx"> 2014-11-17 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] allow host application to opt-out of alternate fullscreen
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -37,20 +37,13 @@
</span><span class="cx"> #import <WebCore/GraphicsContextCG.h>
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><span class="cx"> #import <WebCore/IOSurfacePool.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/WebLayer.h>
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> #import <mach/mach_port.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __has_include(<QuartzCore/CALayerPrivate.h>)
-#import <QuartzCore/CALayerPrivate.h>
-#endif
-
-@interface CALayer (Details)
-@property BOOL contentsOpaque;
-@end
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -32,20 +32,13 @@
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <WebCore/BlockExceptions.h>
</span><span class="cx"> #import <WebCore/PlatformCAFilters.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/ScrollbarThemeMac.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <UIKit/UIView.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __has_include(<QuartzCore/CALayerPrivate.h>)
-#import <QuartzCore/CALayerPrivate.h>
-#endif
-
-@interface CALayer (Details)
-@property BOOL contentsOpaque;
-@end
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> @interface UIView (WKUIViewUtilities)
</span><span class="cx"> - (void)_web_setSubviews:(NSArray *)subviews;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -96,9 +96,9 @@
</span><span class="cx"> #import <UIKit/UIPeripheralHost_Private.h>
</span><span class="cx"> #import <UIKit/UIWindow_Private.h>
</span><span class="cx"> #import <QuartzCore/CARenderServer.h>
</span><del>-#import <QuartzCore/QuartzCorePrivate.h>
</del><span class="cx"> #import <WebCore/CoreGraphicsSPI.h>
</span><span class="cx"> #import <WebCore/InspectorOverlay.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx">
</span><span class="cx"> @interface UIScrollView (UIScrollViewInternal)
</span><span class="cx"> - (void)_adjustForAutomaticKeyboardInfo:(NSDictionary*)info animated:(BOOL)animated lastAdjustment:(CGFloat*)lastAdjustment;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx"> #import "WebPageMessages.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><del>-#import <QuartzCore/QuartzCorePrivate.h>
</del><span class="cx"> #import <UIKit/UIScreenEdgePanGestureRecognizer.h>
</span><span class="cx"> #import <UIKit/UIViewControllerTransitioning_Private.h>
</span><span class="cx"> #import <UIKit/UIWebTouchEventsGestureRecognizer.h>
</span><span class="cx"> #import <UIKit/_UINavigationInteractiveTransition.h>
</span><span class="cx"> #import <UIKit/_UINavigationParallaxTransition.h>
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx"> #import <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -51,13 +51,10 @@
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/InspectorOverlay.h>
</span><span class="cx"> #import <WebCore/NotImplemented.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if __has_include(<QuartzCore/QuartzCorePrivate.h>)
-#import <QuartzCore/QuartzCorePrivate.h>
-#endif
-
</del><span class="cx"> @interface CALayer (Details)
</span><span class="cx"> @property BOOL hitTestsAsOpaque;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKPDFPageNumberIndicatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -28,13 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <QuartzCore/CAFilter.h>
-#import <QuartzCore/CALayerPrivate.h>
</del><span class="cx"> #import <UIKit/UIGeometry_Private.h>
</span><span class="cx"> #import <UIKit/UIKit.h>
</span><span class="cx"> #import <UIKit/UIView_Private.h>
</span><span class="cx"> #import <UIKit/_UIBackdropView_Private.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -30,33 +30,20 @@
</span><span class="cx">
</span><span class="cx"> #import "FrameLoadState.h"
</span><span class="cx"> #import "NativeWebWheelEvent.h"
</span><del>-#import "WebPageGroup.h"
</del><span class="cx"> #import "ViewGestureControllerMessages.h"
</span><span class="cx"> #import "ViewGestureGeometryCollectorMessages.h"
</span><span class="cx"> #import "ViewSnapshotStore.h"
</span><span class="cx"> #import "WebBackForwardList.h"
</span><ins>+#import "WebPageGroup.h"
</ins><span class="cx"> #import "WebPageMessages.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><del>-#import <QuartzCore/QuartzCore.h>
</del><span class="cx"> #import <WebCore/IOSurface.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/WebActionDisablingCALayerDelegate.h>
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<QuartzCore/QuartzCorePrivate.h>)
-#import <QuartzCore/QuartzCorePrivate.h>
-#else
-@interface CAFilter : NSObject <NSCopying, NSMutableCopying, NSCoding>
-@end
-#endif
-
-@interface CAFilter (Details)
-+ (CAFilter *)filterWithType:(NSString *)type;
-@end
-
-extern NSString * const kCAFilterColorInvert;
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> static const double minMagnification = 1;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewSnapshotStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm (176203 => 176204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2014-11-17 17:07:13 UTC (rev 176203)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2014-11-17 17:44:43 UTC (rev 176204)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <QuartzCore/QuartzCorePrivate.h>
</del><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre>
</div>
</div>
</body>
</html>