<!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>[166222] tags/Safari-538.24.2/Source/WebKit2</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/166222">166222</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 23:18:51 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/165983">r165983</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538242SourceWebKit2ChangeLog">tags/Safari-538.24.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari538242SourceWebKit2UIProcessAPICocoaWKPreferencesmm">tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#tagsSafari538242SourceWebKit2UIProcessAPICocoaWKPreferencesInternalh">tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h</a></li>
<li><a href="#tagsSafari538242SourceWebKit2WebKit2xcodeprojprojectpbxproj">tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari538242SourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538242SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/ChangeLog (166221 => 166222)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 06:18:51 UTC (rev 166222)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-24 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r165983
+
+ 2014-03-20 Sam Weinig <sam@webkit.org>
+
+ [Cocoa] Expose preference to enable telephone number detection
+ https://bugs.webkit.org/show_bug.cgi?id=130524
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _telephoneNumberDetectionIsEnabled]):
+ (-[WKPreferences _setTelephoneNumberDetectionIsEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesInternal.h:
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-03-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r166203
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (166221 => 166222)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-03-25 06:18:51 UTC (rev 166222)
</span><span class="lines">@@ -54,4 +54,18 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKPreferences (WKPrivate)
+
+- (BOOL)_telephoneNumberDetectionIsEnabled
+{
+ return _preferences->telephoneNumberParsingEnabled();
+}
+
+- (void)_setTelephoneNumberDetectionIsEnabled:(BOOL)telephoneNumberDetectionIsEnabled
+{
+ _preferences->setTelephoneNumberParsingEnabled(telephoneNumberDetectionIsEnabled);
+}
+
+@end
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2UIProcessAPICocoaWKPreferencesInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h (166221 => 166222)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2014-03-25 06:18:51 UTC (rev 166222)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "WKPreferences.h"
</del><ins>+#import "WKPreferencesPrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538242SourceWebKit2UIProcessAPICocoaWKPreferencesPrivatehfromrev165983trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (from rev 165983, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h) (0 => 166222)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (rev 0)
+++ tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-03-25 06:18:51 UTC (rev 166222)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit2/WKPreferences.h>
+
+#if WK_API_ENABLED
+
+@interface WKPreferences (WKPrivate)
+
+@property (nonatomic, setter=_setTelephoneNumberDetectionIsEnabled:) BOOL _telephoneNumberDetectionIsEnabled;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="tagsSafari538242SourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166221 => 166222)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-25 06:18:51 UTC (rev 166222)
</span><span class="lines">@@ -935,6 +935,7 @@
</span><span class="cx"> 7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */; };
</span><span class="cx"> 7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */; };
</span><span class="cx"> 7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */; };
</span><ins>+ 7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 7C9D1537184584DA009D3918 /* WKBrowsingContextGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */; };
</span><span class="cx"> 7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7CB16FEF1724BA23007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */; };
</span><span class="lines">@@ -2746,6 +2747,7 @@
</span><span class="cx"> 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInformation.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageBannerMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextGroupInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextPolicyDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.ist.ds.appleconnect.webplugin.sb; sourceTree = "<group>"; };
</span><span class="lines">@@ -4546,6 +4548,7 @@
</span><span class="cx"> 1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */,
</span><span class="cx"> 1AFDD3161891C94700153970 /* WKPreferences.h */,
</span><span class="cx"> 1AFDD3181891CA1200153970 /* WKPreferences.mm */,
</span><ins>+ 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */,
</ins><span class="cx"> 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */,
</span><span class="cx"> 1A158418189044F50017616C /* WKProcessPool.h */,
</span><span class="cx"> 1A158417189044F50017616C /* WKProcessPool.mm */,
</span><span class="lines">@@ -6930,6 +6933,7 @@
</span><span class="cx"> BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
</span><span class="cx"> D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
</span><span class="cx"> BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
</span><ins>+ 7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */,
</ins><span class="cx"> C58CDF2A1887548B00871536 /* InteractionInformationAtPosition.h in Headers */,
</span><span class="cx"> BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
</span><span class="cx"> BCD597FF112B57BE00EC8C23 /* WebPreferences.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>