<!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>[176216] branches/safari-600.3-branch/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/176216">176216</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-17 11:45:53 -0800 (Mon, 17 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176156">r176156</a>. rdar://problem/18877535</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreWebCoreexpin">branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreeditingmacDataDetectionmm">branches/safari-600.3-branch/Source/WebCore/editing/mac/DataDetection.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformspimacDataDetectorsSPIh">branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2SharedmacActionMenuHitTestResultmm">branches/safari-600.3-branch/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176215 => 176216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-17 19:44:24 UTC (rev 176215)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-17 19:45:53 UTC (rev 176216)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2014-11-17 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176156. <rdar://problem/18877535>
+
+ 2014-11-15 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to WebCore
+
+ This regressed with the following commit:
+
+ Move DataDetectors scanning code to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=138731
+ <rdar://problem/18877535>
+
+ This fixes the following build failures:
+
+ In file included from WebCore/editing/mac/DataDetection.mm:29:
+ WebCore/platform/spi/mac/DataDetectorsSPI.h:66:11: error: unknown type name 'NSRect'
+ @property NSRect highlightFrame;
+ ^
+ WebCore/editing/mac/DataDetection.mm:42:28: error: use of undeclared identifier 'DataDetection'
+ RetainPtr<DDActionContext> DataDetection::detectItemAroundHitTestResult(const HitTestResult& hitTestResult, FloatRect& detectedDataBoundingBox, RefPtr<Range>& detectedDataRange)
+ ^
+ 2 errors generated.
+
+ * WebCore.exp.in:
+ (DataDetection::detectItemAroundHitTestResult): Move symbol from
+ shared section to Mac-only section.
+ * editing/mac/DataDetection.mm: Add PLATFORM(MAC) check around
+ the entire implementation since it it unused on iOS.
+ * platform/spi/mac/DataDetectorsSPI.h: Expand PLATFORM(MAC)
+ check around DDActionContext class declarations.
+
+2014-11-17 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176137. <rdar://problem/18877535>
</span><span class="cx">
</span><span class="cx"> 2014-11-14 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in (176215 => 176216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in 2014-11-17 19:44:24 UTC (rev 176215)
+++ branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in 2014-11-17 19:45:53 UTC (rev 176216)
</span><span class="lines">@@ -287,7 +287,6 @@
</span><span class="cx"> __ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi
</span><span class="cx"> __ZN7WebCore13ContainerNode11appendChildEN3WTF10PassRefPtrINS_4NodeEEERi
</span><span class="cx"> __ZN7WebCore13ContainerNode11removeChildEPNS_4NodeERi
</span><del>-__ZN7WebCore13DataDetection29detectItemAroundHitTestResultERKNS_13HitTestResultERNS_9FloatRectERN3WTF6RefPtrINS_5RangeEEE
</del><span class="cx"> __ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore13GraphicsLayer12replaceChildEPS0_S1_
</span><span class="cx"> __ZN7WebCore13GraphicsLayer12setZPositionEf
</span><span class="lines">@@ -2274,6 +2273,7 @@
</span><span class="cx"> __ZN7WebCore12EventHandler7mouseUpEP7NSEvent
</span><span class="cx"> __ZN7WebCore12EventHandler8keyEventEP7NSEvent
</span><span class="cx"> __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
</span><ins>+__ZN7WebCore13DataDetection29detectItemAroundHitTestResultERKNS_13HitTestResultERNS_9FloatRectERN3WTF6RefPtrINS_5RangeEEE
</ins><span class="cx"> __ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
</span><span class="cx"> __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreeditingmacDataDetectionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/editing/mac/DataDetection.mm (176215 => 176216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/editing/mac/DataDetection.mm 2014-11-17 19:44:24 UTC (rev 176215)
+++ branches/safari-600.3-branch/Source/WebCore/editing/mac/DataDetection.mm 2014-11-17 19:45:53 UTC (rev 176216)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "DataDetection.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+
</ins><span class="cx"> #import "DataDetectorsSPI.h"
</span><span class="cx"> #import "DictionaryLookup.h"
</span><span class="cx"> #import "FrameView.h"
</span><span class="lines">@@ -100,3 +102,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformspimacDataDetectorsSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176215 => 176216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-17 19:44:24 UTC (rev 176215)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-17 19:45:53 UTC (rev 176216)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> SOFT_LINK_CLASS(DataDetectors, DDActionContext)
</span><del>-SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
</del><span class="cx">
</span><span class="cx"> @interface DDActionContext : NSObject <NSCopying, NSSecureCoding>
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,10 @@
</span><span class="cx"> - (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
+
</ins><span class="cx"> @interface DDActionsManager : NSObject
</span><span class="cx">
</span><span class="cx"> + (DDActionsManager *)sharedManager;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176215 => 176216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-17 19:44:24 UTC (rev 176215)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-17 19:45:53 UTC (rev 176216)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-11-17 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176156. <rdar://problem/18877535>
+
+ 2014-11-15 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to WebCore
+
+ This regressed with the following commit:
+
+ Move DataDetectors scanning code to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=138731
+ <rdar://problem/18877535>
+
+ * Shared/mac/ActionMenuHitTestResult.mm: Add PLATFORM(MAC) check
+ around the entire implementation since it it unused on iOS.
+
+2014-11-17 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176153. <rdar://problem/18877535>
</span><span class="cx">
</span><span class="cx"> 2014-11-15 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2SharedmacActionMenuHitTestResultmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm (176215 => 176216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm 2014-11-17 19:44:24 UTC (rev 176215)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm 2014-11-17 19:45:53 UTC (rev 176216)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "ActionMenuHitTestResult.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+
</ins><span class="cx"> #import "ArgumentCodersCF.h"
</span><span class="cx"> #import "ArgumentDecoder.h"
</span><span class="cx"> #import "ArgumentEncoder.h"
</span><span class="lines">@@ -127,3 +129,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // PLATFORM(MAC)
</ins></span></pre>
</div>
</div>
</body>
</html>