<!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>[214932] trunk</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/214932">214932</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 00:36:05 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ios-simulator] API test WebKit2.DataDetectionReferenceDate timing out
https://bugs.webkit.org/show_bug.cgi?id=161967
Reviewed by Alexey Proskuryakov.
Source/WebCore:
DataDetectorsCoreSPI.h defined DDQueryOffset as a struct of two CFIndexes, which is 16 bytes
on LP64, but the struct is actually defined as two CFIndex-typed 32-bit bitfields, which is
8 bytes on LP64. This breaks the ABI on Public SDK builds when calling functions that take
or return DDQueryOffsets.
* platform/spi/cocoa/DataDetectorsCoreSPI.h: Updated the DDQueryOffset definition for
Public SDK builds, and added a static_assert to detect future size changes at compile time.
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm:
(TEST): Re-enabled WebKit2.DataDetectionReferenceDate.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaDataDetectionmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214931 => 214932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-05 07:09:41 UTC (rev 214931)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 07:36:05 UTC (rev 214932)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-04-05 Andy Estes <aestes@apple.com>
+
+ [ios-simulator] API test WebKit2.DataDetectionReferenceDate timing out
+ https://bugs.webkit.org/show_bug.cgi?id=161967
+
+ Reviewed by Alexey Proskuryakov.
+
+ DataDetectorsCoreSPI.h defined DDQueryOffset as a struct of two CFIndexes, which is 16 bytes
+ on LP64, but the struct is actually defined as two CFIndex-typed 32-bit bitfields, which is
+ 8 bytes on LP64. This breaks the ABI on Public SDK builds when calling functions that take
+ or return DDQueryOffsets.
+
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h: Updated the DDQueryOffset definition for
+ Public SDK builds, and added a static_assert to detect future size changes at compile time.
+
</ins><span class="cx"> 2017-04-04 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Move AVSampleBufferDisplayLayer declarations into AVFoundationSPI.h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (214931 => 214932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2017-04-05 07:09:41 UTC (rev 214931)
+++ trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2017-04-05 07:36:05 UTC (rev 214932)
</span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx"> #define DDResultPropertyPassiveDisplay (1 << 0)
</span><span class="cx">
</span><span class="cx"> typedef struct __DDQueryOffset {
</span><del>- CFIndex queryIndex;
- CFIndex offset;
</del><ins>+ CFIndex queryIndex:32;
+ CFIndex offset:32;
</ins><span class="cx"> } DDQueryOffset;
</span><span class="cx">
</span><span class="cx"> typedef struct __DDQueryRange {
</span><span class="lines">@@ -117,6 +117,8 @@
</span><span class="cx">
</span><span class="cx"> #endif // !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><ins>+static_assert(sizeof(DDQueryOffset) == 8, "DDQueryOffset is no longer 8 bytes. Update the definition of DDQueryOffset in this file to match the new size.");
+
</ins><span class="cx"> typedef struct __DDScanQuery *DDScanQueryRef;
</span><span class="cx"> typedef struct __DDScanner *DDScannerRef;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214931 => 214932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-04-05 07:09:41 UTC (rev 214931)
+++ trunk/Tools/ChangeLog 2017-04-05 07:36:05 UTC (rev 214932)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-04-05 Andy Estes <aestes@apple.com>
+
+ [ios-simulator] API test WebKit2.DataDetectionReferenceDate timing out
+ https://bugs.webkit.org/show_bug.cgi?id=161967
+
+ Reviewed by Alexey Proskuryakov.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm:
+ (TEST): Re-enabled WebKit2.DataDetectionReferenceDate.
+
</ins><span class="cx"> 2017-04-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Various settings in Minibrowser are off by default, and should be on
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm (214931 => 214932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm 2017-04-05 07:09:41 UTC (rev 214931)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm 2017-04-05 07:36:05 UTC (rev 214932)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> ranScript = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WebKit2, DISABLED_DataDetectionReferenceDate)
</del><ins>+TEST(WebKit2, DataDetectionReferenceDate)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><span class="cx"> [configuration setDataDetectorTypes:WKDataDetectorTypeCalendarEvent];
</span></span></pre>
</div>
</div>
</body>
</html>