<!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>[174250] 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/174250">174250</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-10-02 16:56:32 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
https://bugs.webkit.org/show_bug.cgi?id=137370
Reviewed by Tim Horton.
Source/WebCore:
Added _UIHighlightViewSPI.h. When building against the internal SDK it imports <UIKit/_UIHighlightView.h>. Otherwise, it redeclares the SPI we use in WebKit2.
* WebCore.xcodeproj/project.pbxproj:
* platform/spi/ios/_UIHighlightViewSPI.h: Added.
Source/WebKit2:
* UIProcess/ios/WKContentViewInteraction.mm: Included <WebCore/_UIHighlightViewSPI.h> instead of <UIKit/_UIHighlightView.h>.</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebCore/platform/spi/ios/</li>
<li><a href="#trunkSourceWebCoreplatformspiios_UIHighlightViewSPIh">trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174249 => 174250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebCore/ChangeLog 2014-10-02 23:56:32 UTC (rev 174250)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-02 Andy Estes <aestes@apple.com>
+
+ [iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
+ https://bugs.webkit.org/show_bug.cgi?id=137370
+
+ Reviewed by Tim Horton.
+
+ Added _UIHighlightViewSPI.h. When building against the internal SDK it imports <UIKit/_UIHighlightView.h>. Otherwise, it redeclares the SPI we use in WebKit2.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/spi/ios/_UIHighlightViewSPI.h: Added.
+
</ins><span class="cx"> 2014-10-02 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> CSS JIT: add the initial implementation of :nth-child(An+B of selector)
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (174249 => 174250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-02 23:56:32 UTC (rev 174250)
</span><span class="lines">@@ -3720,6 +3720,7 @@
</span><span class="cx"> A14832CD187F682E00DA63A6 /* WebCoreThreadSafe.h in Headers */ = {isa = PBXBuildFile; fileRef = A148329F187F508700DA63A6 /* WebCoreThreadSafe.h */; };
</span><span class="cx"> A14832CE187F683400DA63A6 /* WebCoreThreadSystemInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A0187F508700DA63A6 /* WebCoreThreadSystemInterface.cpp */; };
</span><span class="cx"> A14832CF187F684700DA63A6 /* WebCoreThreadSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = A14832A1187F508700DA63A6 /* WebCoreThreadSystemInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ A172182619DE183F00464D17 /* _UIHighlightViewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
</span><span class="cx"> A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
</span><span class="cx"> A1C797181883DD82000F5E1F /* DOMGestureEvent.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDD1880F901003EEDBB /* DOMGestureEvent.h */; };
</span><span class="lines">@@ -10889,6 +10890,7 @@
</span><span class="cx"> A14832A9187F508700DA63A6 /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKView.h; path = ios/wak/WKView.h; sourceTree = "<group>"; };
</span><span class="cx"> A14832AA187F508700DA63A6 /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/wak/WKView.mm; sourceTree = "<group>"; };
</span><span class="cx"> A14832AB187F508700DA63A6 /* WKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKViewPrivate.h; path = ios/wak/WKViewPrivate.h; sourceTree = "<group>"; };
</span><ins>+ A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _UIHighlightViewSPI.h; path = ios/_UIHighlightViewSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; };
</span><span class="cx"> A1C7971C1883E51F000F5E1F /* DOMHTMLTextAreaElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTextAreaElementPrivate.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16176,6 +16178,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 65086DA619AC1719009AF46B /* cf */,
</span><span class="cx"> 653EF83719A043AE0052202C /* cocoa */,
</span><ins>+ A172182419DE182B00464D17 /* ios */,
</ins><span class="cx"> );
</span><span class="cx"> path = spi;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -18426,6 +18429,14 @@
</span><span class="cx"> name = wak;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ A172182419DE182B00464D17 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> A516E8B2136E04C00076C3C0 /* ios */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -23335,6 +23346,7 @@
</span><span class="cx"> FD31608012B026F700C1A359 /* AudioDSPKernel.h in Headers */,
</span><span class="cx"> FD31608212B026F700C1A359 /* AudioDSPKernelProcessor.h in Headers */,
</span><span class="cx"> FD31608312B026F700C1A359 /* AudioFileReader.h in Headers */,
</span><ins>+ A172182619DE183F00464D17 /* _UIHighlightViewSPI.h in Headers */,
</ins><span class="cx"> CD5596921475B678001D0BD0 /* AudioFileReaderIOS.h in Headers */,
</span><span class="cx"> FD3160BF12B0272A00C1A359 /* AudioFileReaderMac.h in Headers */,
</span><span class="cx"> FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiios_UIHighlightViewSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h (0 => 174250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h 2014-10-02 23:56:32 UTC (rev 174250)
</span><span class="lines">@@ -0,0 +1,47 @@
</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.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <UIKit/_UIHighlightView.h>
+
+#else
+
+#import <UIKit/UIView.h>
+
+@class UIColor;
+
+@interface _UIHighlightView : UIView
+@end
+
+@interface _UIHighlightView (Private)
+- (void)setColor:(UIColor *)color;
+- (void)setCornerRadius:(CGFloat)cornerRadius;
+- (void)setCornerRadii:(NSArray *)cornerRadii;
+- (void)setFrames:(NSArray *)frames boundaryRect:(CGRect)boundaryRect;
+- (void)setQuads:(NSArray *)quads boundaryRect:(CGRect)boundaryRect;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174249 => 174250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-02 23:56:32 UTC (rev 174250)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2014-10-02 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
+ https://bugs.webkit.org/show_bug.cgi?id=137370
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/WKContentViewInteraction.mm: Included <WebCore/_UIHighlightViewSPI.h> instead of <UIKit/_UIHighlightView.h>.
+
+2014-10-02 Andy Estes <aestes@apple.com>
+
</ins><span class="cx"> Fix the iOS build.
</span><span class="cx">
</span><span class="cx"> * WebProcess/WebPage/ios/WebPageIOS.mm:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (174249 => 174250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-10-02 23:50:08 UTC (rev 174249)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-10-02 23:56:32 UTC (rev 174250)
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx"> #import <UIKit/UITapGestureRecognizer_Private.h>
</span><span class="cx"> #import <UIKit/UITextInteractionAssistant_Private.h>
</span><span class="cx"> #import <UIKit/UIWebDocumentView.h> // FIXME: should not include this header.
</span><del>-#import <UIKit/_UIHighlightView.h>
</del><span class="cx"> #import <UIKit/_UIWebHighlightLongPressGestureRecognizer.h>
</span><span class="cx"> #import <WebCore/Color.h>
</span><span class="cx"> #import <WebCore/FloatQuad.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><ins>+#import <WebCore/_UIHighlightViewSPI.h>
</ins><span class="cx"> #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>