Diff
Modified: tags/Safari-538.24.2/Source/WebKit2/ChangeLog (166221 => 166222)
--- 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)
@@ -1,3 +1,21 @@
+2014-03-24 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r165983
+
+ 2014-03-20 Sam Weinig <s...@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:
+
2014-03-24 Lucas Forschler <lforsch...@apple.com>
Merge r166203
Modified: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (166221 => 166222)
--- 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)
@@ -54,4 +54,18 @@
@end
+@implementation WKPreferences (WKPrivate)
+
+- (BOOL)_telephoneNumberDetectionIsEnabled
+{
+ return _preferences->telephoneNumberParsingEnabled();
+}
+
+- (void)_setTelephoneNumberDetectionIsEnabled:(BOOL)telephoneNumberDetectionIsEnabled
+{
+ _preferences->setTelephoneNumberParsingEnabled(telephoneNumberDetectionIsEnabled);
+}
+
+@end
+
#endif // WK_API_ENABLED
Modified: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h (166221 => 166222)
--- 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)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WKPreferences.h"
+#import "WKPreferencesPrivate.h"
#if WK_API_ENABLED
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)
--- 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)
@@ -0,0 +1,36 @@
+/*
+ * 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
Modified: tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166221 => 166222)
--- 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)
@@ -935,6 +935,7 @@
7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */; };
7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */; };
7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */; };
+ 7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
7C9D1537184584DA009D3918 /* WKBrowsingContextGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */; };
7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
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 */; };
@@ -2746,6 +2747,7 @@
7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInformation.h; sourceTree = "<group>"; };
7C6D37FA172F555F009D2847 /* PageBannerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageBannerMac.mm; sourceTree = "<group>"; };
7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessCocoa.mm; sourceTree = "<group>"; };
+ 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextGroupInternal.h; sourceTree = "<group>"; };
7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextPolicyDelegate.h; sourceTree = "<group>"; };
7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.ist.ds.appleconnect.webplugin.sb; sourceTree = "<group>"; };
@@ -4546,6 +4548,7 @@
1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */,
1AFDD3161891C94700153970 /* WKPreferences.h */,
1AFDD3181891CA1200153970 /* WKPreferences.mm */,
+ 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */,
1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */,
1A158418189044F50017616C /* WKProcessPool.h */,
1A158417189044F50017616C /* WKProcessPool.mm */,
@@ -6930,6 +6933,7 @@
BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
+ 7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */,
C58CDF2A1887548B00871536 /* InteractionInformationAtPosition.h in Headers */,
BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
BCD597FF112B57BE00EC8C23 /* WebPreferences.h in Headers */,
