<!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>[192280] 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/192280">192280</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 16:49:12 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt formal protocols for CA delegates
https://bugs.webkit.org/show_bug.cgi?id=151121
<rdar://problem/6739193>
Reviewed by Anders Carlsson.
* platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h:
Note that our WebActionDisablingCALayerDelegate is, in fact, a CALayerDelegate.
* platform/spi/cocoa/QuartzCoreSPI.h:
Add empty protocol definitions where necessary.
* WebCore.xcodeproj/project.pbxproj:
* platform/spi/mac/NSAccessibilitySPI.h: Added.
* platform/spi/mac/NSApplicationSPI.h: Added.
* platform/spi/mac/NSTextFinderSPI.h: Added.
* platform/spi/mac/NSViewSPI.h: Added.
Split out SPI headers from WebKit2's AppKitSPI.h.
Add NSViewSPI to note that NSView is (internally) a CALayerDelegate,
which WebHTMLView depends on.
* WebView/WebHTMLView.mm:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/Cocoa/WebViewImpl.mm:
* UIProcess/mac/WKTextFinderClient.mm:
* UIProcess/mac/WebPageProxyMac.mm:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/cocoa/WebProcessCocoa.mm:
Adapt to the split out SPI headers.
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
Conform!</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="#trunkSourceWebCoreplatformgraphicscocoaWebActionDisablingCALayerDelegateh">trunk/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKTextFinderClientmm">trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemotemm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspimacNSAccessibilitySPIh">trunk/Source/WebCore/platform/spi/mac/NSAccessibilitySPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSApplicationSPIh">trunk/Source/WebCore/platform/spi/mac/NSApplicationSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSTextFinderSPIh">trunk/Source/WebCore/platform/spi/mac/NSTextFinderSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSViewSPIh">trunk/Source/WebCore/platform/spi/mac/NSViewSPI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Platform/spi/mac/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebCore/ChangeLog 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-11-10 Tim Horton <timothy_horton@apple.com>
+
+ Adopt formal protocols for CA delegates
+ https://bugs.webkit.org/show_bug.cgi?id=151121
+ <rdar://problem/6739193>
+
+ Reviewed by Anders Carlsson.
+
+ * platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h:
+ Note that our WebActionDisablingCALayerDelegate is, in fact, a CALayerDelegate.
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ Add empty protocol definitions where necessary.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/spi/mac/NSAccessibilitySPI.h: Added.
+ * platform/spi/mac/NSApplicationSPI.h: Added.
+ * platform/spi/mac/NSTextFinderSPI.h: Added.
+ * platform/spi/mac/NSViewSPI.h: Added.
+ Split out SPI headers from WebKit2's AppKitSPI.h.
+ Add NSViewSPI to note that NSView is (internally) a CALayerDelegate,
+ which WebHTMLView depends on.
+
</ins><span class="cx"> 2015-11-10 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Continuations with anonymous wrappers inside misplaces child renderers.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -339,10 +339,10 @@
</span><span class="cx"> 07D07B141834158800ABDD3C /* JSRTCSessionDescriptionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07D07B131834158800ABDD3C /* JSRTCSessionDescriptionCustom.cpp */; };
</span><span class="cx"> 07D637401BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6373E1BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h */; };
</span><span class="cx"> 07D637411BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07D6373F1BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.mm */; };
</span><del>- 07D6A4EF1BECF2D200174146 /* MockRealtimeMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07D6A4ED1BECF2D200174146 /* MockRealtimeMediaSource.cpp */; settings = {ASSET_TAGS = (); }; };
- 07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4EE1BECF2D200174146 /* MockRealtimeMediaSource.h */; settings = {ASSET_TAGS = (); }; };
- 07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07D6A4F11BED5F8800174146 /* MockRealtimeAudioSource.cpp */; settings = {ASSET_TAGS = (); }; };
- 07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4F21BED5F8800174146 /* MockRealtimeAudioSource.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 07D6A4EF1BECF2D200174146 /* MockRealtimeMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07D6A4ED1BECF2D200174146 /* MockRealtimeMediaSource.cpp */; };
+ 07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4EE1BECF2D200174146 /* MockRealtimeMediaSource.h */; };
+ 07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07D6A4F11BED5F8800174146 /* MockRealtimeAudioSource.cpp */; };
+ 07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4F21BED5F8800174146 /* MockRealtimeAudioSource.h */; };
</ins><span class="cx"> 07DC5FD417D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07DC5FD317D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp */; };
</span><span class="cx"> 07E116B11489C9A100EC5ACE /* JSTextTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */; };
</span><span class="cx"> 07E117071489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */; };
</span><span class="lines">@@ -350,10 +350,10 @@
</span><span class="cx"> 07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */; };
</span><span class="cx"> 07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */; };
</span><span class="cx"> 07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.cpp */; };
</span><del>- 07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */; settings = {ASSET_TAGS = (); }; };
- 07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */; settings = {ASSET_TAGS = (); }; };
- 07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76ED1BEA619800F89133 /* MockRealtimeVideoSourceMac.h */; settings = {ASSET_TAGS = (); }; };
- 07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07EE76EE1BEA619800F89133 /* MockRealtimeVideoSourceMac.mm */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */; };
+ 07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */; };
+ 07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76ED1BEA619800F89133 /* MockRealtimeVideoSourceMac.h */; };
+ 07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07EE76EE1BEA619800F89133 /* MockRealtimeVideoSourceMac.mm */; };
</ins><span class="cx"> 07F0B97A1AC5DB3300E535D9 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */; };
</span><span class="cx"> 07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1166,6 +1166,10 @@
</span><span class="cx"> 2D70BA1518074F860001908A /* PlatformCALayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D70BA1418074F850001908A /* PlatformCALayer.cpp */; };
</span><span class="cx"> 2D76BB821945632400CFD29A /* RunLoopObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D76BB801945632400CFD29A /* RunLoopObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2D76BB8419456F8100CFD29A /* RunLoopObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D76BB8319456F8100CFD29A /* RunLoopObserver.cpp */; };
</span><ins>+ 2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D77AC271BF2B9860072470A /* NSApplicationSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D77AC281BF2B9860072470A /* NSTextFinderSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D77AC2C1BF2B9A00072470A /* NSViewSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 2D7ED0AB1BAE99170043B3E5 /* TimerEventBasedMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7ED0A91BAE99170043B3E5 /* TimerEventBasedMock.h */; };
</span><span class="cx"> 2D7ED0AC1BAE99170043B3E5 /* UserMediaClientMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7ED0AA1BAE99170043B3E5 /* UserMediaClientMock.h */; };
</span><span class="cx"> 2D8287F616E4A0380086BD00 /* HitTestLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8287F416E4A0380086BD00 /* HitTestLocation.cpp */; };
</span><span class="lines">@@ -5007,10 +5011,10 @@
</span><span class="cx"> B2C3DA6B0D006CD600EF6F26 /* FontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B2C96D8D0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */; };
</span><ins>+ B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */; };
</ins><span class="cx"> B2D3DA640D006CD600EF6F3A /* OpenTypeCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3DA530D006CD600EF6F3A /* OpenTypeCG.cpp */; };
</span><ins>+ B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> B2D3DA650D006CD600EF6F3A /* OpenTypeCG.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3DA540D006CD600EF6F3A /* OpenTypeCG.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */; };
- B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> B2D3EA650D006CD600EF6F28 /* OpenTypeTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3EA540D006CD600EF6F28 /* OpenTypeTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B2E27C9F0B0F2B0900F17C7B /* FloatPoint3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2E27C9D0B0F2B0900F17C7B /* FloatPoint3D.cpp */; };
</span><span class="cx"> B2E27CA00B0F2B0900F17C7B /* FloatPoint3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B2E27C9E0B0F2B0900F17C7B /* FloatPoint3D.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8513,6 +8517,10 @@
</span><span class="cx"> 2D70BA1418074F850001908A /* PlatformCALayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCALayer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D76BB801945632400CFD29A /* RunLoopObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoopObserver.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D76BB8319456F8100CFD29A /* RunLoopObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoopObserver.cpp; sourceTree = "<group>"; };
</span><ins>+ 2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAccessibilitySPI.h; sourceTree = "<group>"; };
+ 2D77AC271BF2B9860072470A /* NSApplicationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSApplicationSPI.h; sourceTree = "<group>"; };
+ 2D77AC281BF2B9860072470A /* NSTextFinderSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTextFinderSPI.h; sourceTree = "<group>"; };
+ 2D77AC2C1BF2B9A00072470A /* NSViewSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSViewSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2D7ED0A91BAE99170043B3E5 /* TimerEventBasedMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerEventBasedMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D7ED0AA1BAE99170043B3E5 /* UserMediaClientMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMediaClientMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D8287F416E4A0380086BD00 /* HitTestLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestLocation.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -12755,10 +12763,10 @@
</span><span class="cx"> B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontSelector.h; sourceTree = "<group>"; };
</span><span class="cx"> B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphBuffer.h; sourceTree = "<group>"; };
</span><span class="cx"> B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPathSegCustom.cpp; sourceTree = "<group>"; };
</span><ins>+ B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OpenTypeMathData.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> B2D3DA530D006CD600EF6F3A /* OpenTypeCG.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OpenTypeCG.cpp; sourceTree = "<group>"; };
</span><ins>+ B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenTypeMathData.h; sourceTree = "<group>"; };
</ins><span class="cx"> B2D3DA540D006CD600EF6F3A /* OpenTypeCG.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenTypeCG.h; sourceTree = "<group>"; };
</span><del>- B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OpenTypeMathData.cpp; sourceTree = "<group>"; };
- B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenTypeMathData.h; sourceTree = "<group>"; };
</del><span class="cx"> B2D3EA540D006CD600EF6F28 /* OpenTypeTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenTypeTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> B2E27C9D0B0F2B0900F17C7B /* FloatPoint3D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FloatPoint3D.cpp; sourceTree = "<group>"; };
</span><span class="cx"> B2E27C9E0B0F2B0900F17C7B /* FloatPoint3D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FloatPoint3D.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -18618,6 +18626,8 @@
</span><span class="cx"> 9348428019F1A9190009D5AE /* mac */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */,
+ 2D77AC271BF2B9860072470A /* NSApplicationSPI.h */,
</ins><span class="cx"> 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */,
</span><span class="cx"> 2D59F1BE1A0044C6001F3D29 /* DataDetectorsSPI.h */,
</span><span class="cx"> 2D413F601A187A3F0041A521 /* LookupSPI.h */,
</span><span class="lines">@@ -18629,6 +18639,8 @@
</span><span class="cx"> F40EA8AA1B867D6500CE5581 /* NSScrollingInputFilterSPI.h */,
</span><span class="cx"> 2DCB837719F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h */,
</span><span class="cx"> 2DCB837819F99BBA00A7FBE4 /* NSSharingServiceSPI.h */,
</span><ins>+ 2D77AC281BF2B9860072470A /* NSTextFinderSPI.h */,
+ 2D77AC2C1BF2B9A00072470A /* NSViewSPI.h */,
</ins><span class="cx"> 2D0CF8161BCF5DE1007A4937 /* NSWindowSPI.h */,
</span><span class="cx"> 937F4CCB1A2D48C100BB39F5 /* QuickLookMacSPI.h */,
</span><span class="cx"> 2D232BFF1A326EF9006BF2DB /* TUCallSPI.h */,
</span><span class="lines">@@ -26141,6 +26153,7 @@
</span><span class="cx"> A80E7B0C0A19D606007FB8C5 /* JSHTMLTitleElement.h in Headers */,
</span><span class="cx"> 070756D414239A4F00414161 /* JSHTMLTrackElement.h in Headers */,
</span><span class="cx"> 1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */,
</span><ins>+ 2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */,
</ins><span class="cx"> 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */,
</span><span class="cx"> E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */,
</span><span class="cx"> C585A67D11D4FB08004C3E4B /* JSIDBAny.h in Headers */,
</span><span class="lines">@@ -27047,6 +27060,7 @@
</span><span class="cx"> 1A3586E015264C450022A659 /* RenderMultiColumnFlowThread.h in Headers */,
</span><span class="cx"> BCE32B9C1517C0B200F542EC /* RenderMultiColumnSet.h in Headers */,
</span><span class="cx"> BC1A7D9818FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.h in Headers */,
</span><ins>+ 2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */,
</ins><span class="cx"> 8AC822FD180FC03300FB64D5 /* RenderNamedFlowFragment.h in Headers */,
</span><span class="cx"> BC85F23D151915E000BC17BE /* RenderNamedFlowThread.h in Headers */,
</span><span class="cx"> BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */,
</span><span class="lines">@@ -27247,6 +27261,7 @@
</span><span class="cx"> 5D925B680F64D4DD00B847F0 /* ScrollBehavior.h in Headers */,
</span><span class="cx"> 1AA84F05143BA7BD0051D153 /* ScrollController.h in Headers */,
</span><span class="cx"> 0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */,
</span><ins>+ 2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */,
</ins><span class="cx"> 1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */,
</span><span class="cx"> 0FC4E40D187F82E10045882C /* ScrollingCoordinatorIOS.h in Headers */,
</span><span class="cx"> 9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */,
</span><span class="lines">@@ -27968,6 +27983,7 @@
</span><span class="cx"> 93F1D5BB12D532C400832BEC /* WebGLLoseContext.h in Headers */,
</span><span class="cx"> 49C7B9D51042D32F0009D447 /* WebGLObject.h in Headers */,
</span><span class="cx"> 49C7B9D71042D32F0009D447 /* WebGLProgram.h in Headers */,
</span><ins>+ 2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */,
</ins><span class="cx"> 6F995A201A7078B100A735F4 /* WebGLQuery.h in Headers */,
</span><span class="cx"> 49C7B9DA1042D32F0009D447 /* WebGLRenderbuffer.h in Headers */,
</span><span class="cx"> 49C7B9E01042D32F0009D447 /* WebGLRenderingContext.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaWebActionDisablingCALayerDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -26,8 +26,10 @@
</span><span class="cx"> #ifndef WebActionDisablingCALayerDelegate_h
</span><span class="cx"> #define WebActionDisablingCALayerDelegate_h
</span><span class="cx">
</span><del>-WEBCORE_EXPORT @interface WebActionDisablingCALayerDelegate : NSObject
</del><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx">
</span><ins>+WEBCORE_EXPORT @interface WebActionDisablingCALayerDelegate : NSObject <CALayerDelegate>
+
</ins><span class="cx"> + (instancetype)shared;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -195,3 +195,11 @@
</span><span class="cx"> EXTERN_C NSString * const kCAContextDisplayName;
</span><span class="cx"> EXTERN_C NSString * const kCAContextDisplayId;
</span><span class="cx"> EXTERN_C NSString * const kCAContextIgnoresHitTest;
</span><ins>+
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100)
+@protocol CALayerDelegate <NSObject>
+@end
+
+@protocol CAAnimationDelegate <NSObject>
+@end
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSAccessibilitySPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/mac/NSAccessibilitySPI.h (0 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSAccessibilitySPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/mac/NSAccessibilitySPI.h 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#if USE(APPKIT)
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <AppKit/NSAccessibilityRemoteUIElement.h>
+
+#else
+
+@interface NSAccessibilityRemoteUIElement : NSObject
+
++ (void)setRemoteUIApp:(BOOL)flag;
+
+@end
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // USE(APPKIT)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSApplicationSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/mac/NSApplicationSPI.h (0 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSApplicationSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/mac/NSApplicationSPI.h 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#if USE(APPKIT)
+
+@interface NSApplication ()
+
+- (void)speakString:(NSString *)string;
+- (void)_setCurrentEvent:(NSEvent *)event;
+
+@end
+
+#endif // USE(APPKIT)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSTextFinderSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/mac/NSTextFinderSPI.h (0 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSTextFinderSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/mac/NSTextFinderSPI.h 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#if USE(APPKIT)
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <AppKit/NSTextFinder_Private.h>
+
+#else
+
+typedef enum : NSUInteger {
+ NSTextFinderAsynchronousDocumentFindOptionsBackwards = 1 << 0,
+ NSTextFinderAsynchronousDocumentFindOptionsWrap = 1 << 1,
+ NSTextFinderAsynchronousDocumentFindOptionsCaseInsensitive = 1 << 2,
+ NSTextFinderAsynchronousDocumentFindOptionsStartsWith = 1 << 3,
+} NSTextFinderAsynchronousDocumentFindOptions;
+
+@protocol NSTextFinderAsynchronousDocumentFindMatch <NSObject>
+@required
+@property (retain, nonatomic, readonly) NSView *containingView;
+@property (retain, nonatomic, readonly) NSArray *textRects;
+- (void)generateTextImage:(void (^)(NSImage *))completionHandler;
+@end
+
+@interface NSObject ()
+
+- (void)findMatchesForString:(NSString *)targetString relativeToMatch:(id <NSTextFinderAsynchronousDocumentFindMatch>)relativeMatch findOptions:(NSTextFinderAsynchronousDocumentFindOptions)findOptions maxResults:(NSUInteger)maxResults resultCollector:(void (^)(NSArray *matches, BOOL didWrap))resultCollector;
+- (NSView *)documentContainerView;
+- (void)getSelectedText:(void (^)(NSString *selectedTextString))completionHandler;
+- (void)selectFindMatch:(id <NSTextFinderAsynchronousDocumentFindMatch>)findMatch completionHandler:(void (^)(void))completionHandler;
+
+@end
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // USE(APPKIT)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSViewSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/mac/NSViewSPI.h (0 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSViewSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/mac/NSViewSPI.h 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#if USE(APPKIT)
+
+#import <WebCore/QuartzCoreSPI.h>
+
+@interface NSView () <CALayerDelegate>
+@end
+
+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-10 Tim Horton <timothy_horton@apple.com>
+
+ Adopt formal protocols for CA delegates
+ https://bugs.webkit.org/show_bug.cgi?id=151121
+ <rdar://problem/6739193>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebHTMLView.mm:
+
</ins><span class="cx"> 2015-11-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Add a mock AppleTV device for testing
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/NSURLFileTypeMappingsSPI.h>
</span><ins>+#import <WebCore/NSViewSPI.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderView.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-10 Tim Horton <timothy_horton@apple.com>
+
+ Adopt formal protocols for CA delegates
+ https://bugs.webkit.org/show_bug.cgi?id=151121
+ <rdar://problem/6739193>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ * UIProcess/mac/WKTextFinderClient.mm:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ Adapt to the split out SPI headers.
+
+ * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+ Conform!
+
</ins><span class="cx"> 2015-11-10 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #import "APIFormClient.h"
</span><span class="cx"> #import "APIPageConfiguration.h"
</span><span class="cx"> #import "APISerializedScriptValue.h"
</span><del>-#import "AppKitSPI.h"
</del><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><span class="cx"> #import "DiagnosticLoggingClient.h"
</span><span class="cx"> #import "FindClient.h"
</span><span class="lines">@@ -84,6 +83,7 @@
</span><span class="cx"> #import "_WKVisitedLinkStoreInternal.h"
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><span class="cx"> #import <WebCore/JSDOMBinding.h>
</span><ins>+#import <WebCore/NSTextFinderSPI.h>
</ins><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/MathExtras.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #import "APILegacyContextHistoryClient.h"
</span><del>-#import "AppKitSPI.h"
</del><span class="cx"> #import "ColorSpaceData.h"
</span><span class="cx"> #import "GenericCallback.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="lines">@@ -74,7 +73,9 @@
</span><span class="cx"> #import <WebCore/KeypressCommand.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/LookupSPI.h>
</span><ins>+#import <WebCore/NSApplicationSPI.h>
</ins><span class="cx"> #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</span><ins>+#import <WebCore/NSTextFinderSPI.h>
</ins><span class="cx"> #import <WebCore/NSWindowSPI.h>
</span><span class="cx"> #import <WebCore/PlatformEventFactoryMac.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKTextFinderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx">
</span><span class="cx"> #import "APIFindClient.h"
</span><span class="cx"> #import "APIFindMatchesClient.h"
</span><del>-#import "AppKitSPI.h"
</del><span class="cx"> #import "WebImage.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><ins>+#import <WebCore/NSTextFinderSPI.h>
</ins><span class="cx"> #import <wtf/Deque.h>
</span><span class="cx">
</span><span class="cx"> // FIXME: Implement support for replace.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #import "APIUIClient.h"
</span><del>-#import "AppKitSPI.h"
</del><span class="cx"> #import "AttributedString.h"
</span><span class="cx"> #import "ColorSpaceData.h"
</span><span class="cx"> #import "DataReference.h"
</span><span class="lines">@@ -50,6 +49,7 @@
</span><span class="cx"> #import <WebCore/DictationAlternative.h>
</span><span class="cx"> #import <WebCore/DictionaryLookup.h>
</span><span class="cx"> #import <WebCore/GraphicsLayer.h>
</span><ins>+#import <WebCore/NSApplicationSPI.h>
</ins><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="cx"> #import <WebCore/TextAlternativeWithRange.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -805,7 +805,6 @@
</span><span class="cx"> 37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
</span><span class="cx"> 37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */; };
</span><span class="cx"> 377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 37777A0E1BD2CA11007F74B5 /* AppKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 37777A0D1BD2CA11007F74B5 /* AppKitSPI.h */; };
</del><span class="cx"> 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3004,7 +3003,6 @@
</span><span class="cx"> 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundleFormClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessAssertion.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEvents.h; sourceTree = "<group>"; };
</span><del>- 37777A0D1BD2CA11007F74B5 /* AppKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppKitSPI.h; sourceTree = "<group>"; };
</del><span class="cx"> 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
</span><span class="cx"> 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
</span><span class="cx"> 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserScriptInjectionTime.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5369,14 +5367,6 @@
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 37777A0C1BD2C9D6007F74B5 /* mac */ = {
- isa = PBXGroup;
- children = (
- 37777A0D1BD2CA11007F74B5 /* AppKitSPI.h */,
- );
- path = mac;
- sourceTree = "<group>";
- };
</del><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -7485,7 +7475,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> 3754D5411B3A2998003A4C7F /* Cocoa */,
</span><span class="cx"> CE1A0BCB1A48E6C60054EF74 /* ios */,
</span><del>- 37777A0C1BD2C9D6007F74B5 /* mac */,
</del><span class="cx"> );
</span><span class="cx"> path = spi;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7617,7 +7606,6 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 1A3A73CE1A48C6D4007231B3 /* APIPageGroupHandle.h in Headers */,
</span><del>- 37777A0E1BD2CA11007F74B5 /* AppKitSPI.h in Headers */,
</del><span class="cx"> 7C4ED3291A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h in Headers */,
</span><span class="cx"> E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */,
</span><span class="cx"> 1A7284471959ED100007BCE5 /* SessionStateConversion.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemotemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import <WebCore/GraphicsLayer.h>
</span><span class="cx"> #import <WebCore/PlatformCAAnimationCocoa.h>
</span><span class="cx"> #import <WebCore/PlatformCAFilters.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebCore/TextStream.h>
</span><span class="cx"> #import <WebCore/TimingFunction.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> static NSString * const WKExplicitBeginTimeFlag = @"WKPlatformCAAnimationExplicitBeginTimeFlag";
</span><span class="cx">
</span><del>-@interface WKAnimationDelegate : NSObject {
</del><ins>+@interface WKAnimationDelegate : NSObject <CAAnimationDelegate> {
</ins><span class="cx"> GraphicsLayer::PlatformLayerID _layerID;
</span><span class="cx"> WebKit::RemoteLayerTreeHost* _layerTreeHost;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (192279 => 192280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-11-11 00:29:12 UTC (rev 192279)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-11-11 00:49:12 UTC (rev 192280)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/MemoryCache.h>
</span><span class="cx"> #import <WebCore/MemoryPressureHandler.h>
</span><ins>+#import <WebCore/NSAccessibilitySPI.h>
</ins><span class="cx"> #import <WebCore/PageCache.h>
</span><span class="cx"> #import <WebCore/pthreadSPI.h>
</span><span class="cx"> #import <WebCore/VNodeTracker.h>
</span><span class="lines">@@ -61,10 +62,6 @@
</span><span class="cx"> #import <stdio.h>
</span><span class="cx"> #import <wtf/RAMSize.h>
</span><span class="cx">
</span><del>-#if USE(APPKIT)
-#import "AppKitSPI.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <WebCore/GraphicsServicesSPI.h>
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>