Diff
Modified: trunk/Source/_javascript_Core/API/JSWrapperMap.mm (200865 => 200866)
--- trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2016-05-13 18:29:52 UTC (rev 200866)
@@ -41,14 +41,10 @@
#import <wtf/HashSet.h>
#import <wtf/Vector.h>
#import <wtf/spi/cocoa/NSMapTableSPI.h>
+#import <wtf/spi/darwin/dyldSPI.h>
#include <mach-o/dyld.h>
-#if USE(APPLE_INTERNAL_SDK)
-#include <mach-o/dyld_priv.h>
-#endif
-extern "C" uint32_t dyld_get_program_sdk_version();
-
#if PLATFORM(APPLETV)
#elif PLATFORM(IOS)
static const uint32_t firstSDKVersionWithInitConstructorSupport = 0x80000; // iOS 8.0.0
Modified: trunk/Source/_javascript_Core/ChangeLog (200865 => 200866)
--- trunk/Source/_javascript_Core/ChangeLog 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,3 +1,16 @@
+2016-05-13 Beth Dakin <[email protected]>
+
+ Add dyldSPI.h for linked on or after checks, and add one for link preview
+ https://bugs.webkit.org/show_bug.cgi?id=157401
+ -and corresponding-
+ rdar://problem/26253396
+
+ Reviewed by Darin Adler.
+
+ Import #import <wtf/spi/darwin/dyldSPI.h> which now declares all of the
+ needed dyld code.
+ * API/JSWrapperMap.mm:
+
2016-05-13 Yusuke Suzuki <[email protected]>
Assertion failure for direct eval in non-class method
Modified: trunk/Source/WTF/ChangeLog (200865 => 200866)
--- trunk/Source/WTF/ChangeLog 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WTF/ChangeLog 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,3 +1,16 @@
+2016-05-13 Beth Dakin <[email protected]>
+
+ Add dyldSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=157401
+ -and corresponding-
+ rdar://problem/26253396
+
+ Reviewed by Darin Adler.
+
+ New header for dyld spi.
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/spi/darwin/dyldSPI.h: Added.
+
2016-05-13 Youenn Fablet <[email protected]>
DOMPromise should only restrict the resolution type
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (200865 => 200866)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-05-13 18:29:52 UTC (rev 200866)
@@ -119,6 +119,7 @@
93934BD318A1E8C300D0D6A1 /* StringViewObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93934BD218A1E8C300D0D6A1 /* StringViewObjC.mm */; };
93934BD518A1F16900D0D6A1 /* StringViewCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93934BD418A1F16900D0D6A1 /* StringViewCF.cpp */; };
93AC91A818942FC400244939 /* LChar.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AC91A718942FC400244939 /* LChar.h */; };
+ 93DDE9321CDC052D00FD3491 /* dyldSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DDE9311CDC052D00FD3491 /* dyldSPI.h */; };
93F1993E19D7958D00C2390B /* StringView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F1993D19D7958D00C2390B /* StringView.cpp */; };
974CFC8E16A4F327006D5404 /* WeakPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 974CFC8D16A4F327006D5404 /* WeakPtr.h */; };
9BC70F05176C379D00101DEC /* AtomicStringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */; };
@@ -436,6 +437,7 @@
93934BD218A1E8C300D0D6A1 /* StringViewObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = StringViewObjC.mm; path = mac/StringViewObjC.mm; sourceTree = "<group>"; };
93934BD418A1F16900D0D6A1 /* StringViewCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringViewCF.cpp; path = cf/StringViewCF.cpp; sourceTree = "<group>"; };
93AC91A718942FC400244939 /* LChar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LChar.h; sourceTree = "<group>"; };
+ 93DDE9311CDC052D00FD3491 /* dyldSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dyldSPI.h; sourceTree = "<group>"; };
93F1993D19D7958D00C2390B /* StringView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringView.cpp; sourceTree = "<group>"; };
974CFC8D16A4F327006D5404 /* WeakPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakPtr.h; sourceTree = "<group>"; };
9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicStringTable.cpp; sourceTree = "<group>"; };
@@ -1091,6 +1093,7 @@
DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */,
A5098AFF1C169E0700087797 /* SandboxSPI.h */,
CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
+ 93DDE9311CDC052D00FD3491 /* dyldSPI.h */,
);
path = darwin;
sourceTree = "<group>";
@@ -1144,6 +1147,7 @@
A8A4738A151A825B004123FF /* Bitmap.h in Headers */,
A8A4738C151A825B004123FF /* BitVector.h in Headers */,
1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */,
+ 93DDE9321CDC052D00FD3491 /* dyldSPI.h in Headers */,
A8A4738E151A825B004123FF /* BlockStack.h in Headers */,
A8A4738F151A825B004123FF /* BloomFilter.h in Headers */,
0F93274B1C17F4B700CF6564 /* Box.h in Headers */,
Added: trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h (0 => 200866)
--- trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h (rev 0)
+++ trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h 2016-05-13 18:29:52 UTC (rev 200866)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2016 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. ``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
+ * 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.
+ */
+
+#pragma once
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <mach-o/dyld_priv.h>
+
+#else
+
+#define DYLD_IOS_VERSION_3_0 0x00030000
+#define DYLD_IOS_VERSION_4_2 0x00040200
+#define DYLD_IOS_VERSION_5_0 0x00050000
+#define DYLD_IOS_VERSION_6_0 0x00060000
+#define DYLD_IOS_VERSION_7_0 0x00070000
+#define DYLD_IOS_VERSION_9_0 0x00090000
+
+#endif
+
+extern "C" uint32_t dyld_get_program_sdk_version();
Modified: trunk/Source/WebCore/ChangeLog (200865 => 200866)
--- trunk/Source/WebCore/ChangeLog 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebCore/ChangeLog 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,3 +1,20 @@
+2016-05-13 Beth Dakin <[email protected]>
+
+ Add dyldSPI.h for linked on or after checks, and add one for link preview
+ https://bugs.webkit.org/show_bug.cgi?id=157401
+ -and corresponding-
+ rdar://problem/26253396
+
+ Reviewed by Darin Adler.
+
+ This patch removes DynamicLinkerSPI.h and replaces it with
+ wtf/spi/darwin/dyldSPI.h
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/HTMLObjectElement.cpp:
+ * platform/graphics/ios/FontServicesIOS.mm:
+ * platform/spi/cocoa/DynamicLinkerSPI.h: Removed.
+
2016-05-13 Brady Eidson <[email protected]>
Give CrossThreadCopier a default specialization for Vectors of objects.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (200865 => 200866)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-13 18:29:52 UTC (rev 200866)
@@ -6215,7 +6215,6 @@
CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MediaPlayerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252421A16C01A00864480 /* CoreUISPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
- CE1252451A16C22500864480 /* DynamicLinkerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252441A16C22500864480 /* DynamicLinkerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE1252491A16C3BC00864480 /* MobileGestaltSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */; };
CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524E1A1A78D200864480 /* MachVMSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -14253,7 +14252,6 @@
CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuartzCoreSPI.h; sourceTree = "<group>"; };
CE1252401A16B1B600864480 /* MediaPlayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerSPI.h; sourceTree = "<group>"; };
CE1252421A16C01A00864480 /* CoreUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreUISPI.h; sourceTree = "<group>"; };
- CE1252441A16C22500864480 /* DynamicLinkerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerSPI.h; sourceTree = "<group>"; };
CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileGestaltSPI.h; sourceTree = "<group>"; };
CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOPMLibSPI.h; sourceTree = "<group>"; };
CE12524E1A1A78D200864480 /* MachVMSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachVMSPI.h; sourceTree = "<group>"; };
@@ -17605,7 +17603,6 @@
CD4097FF1A8C855F004C65E9 /* CFNSURLConnectionSPI.h */,
1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */,
935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */,
- CE1252441A16C22500864480 /* DynamicLinkerSPI.h */,
CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */,
44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */,
@@ -25992,7 +25989,6 @@
A7CFB3D20B7ED10A0070C32D /* DragImage.h in Headers */,
81F65FF613788FAA00FF6F2D /* DragState.h in Headers */,
E1BA66F11742BD8600C20251 /* DynamicLinkerInterposing.h in Headers */,
- CE1252451A16C22500864480 /* DynamicLinkerSPI.h in Headers */,
FD6ED2C8136B8E66003CF072 /* DynamicsCompressor.h in Headers */,
FD537357137B653B00008DCE /* DynamicsCompressorKernel.h in Headers */,
FD6ED2C4136B8E42003CF072 /* DynamicsCompressorNode.h in Headers */,
Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (200865 => 200866)
--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2016-05-13 18:29:52 UTC (rev 200866)
@@ -53,9 +53,9 @@
#include "Text.h"
#include "Widget.h"
#include <wtf/Ref.h>
+#include <wtf/spi/darwin/dyldSPI.h>
#if PLATFORM(IOS)
-#include "DynamicLinkerSPI.h"
#include "RuntimeApplicationChecks.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm (200865 => 200866)
--- trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm 2016-05-13 18:29:52 UTC (rev 200866)
@@ -26,10 +26,10 @@
#import "FontServicesIOS.h"
#import "CoreGraphicsSPI.h"
-#import "DynamicLinkerSPI.h"
#import "FontMetrics.h"
#import "OpenTypeCG.h"
#import <wtf/RetainPtr.h>
+#import <wtf/spi/darwin/dyldSPI.h>
namespace WebCore {
Deleted: trunk/Source/WebCore/platform/spi/cocoa/DynamicLinkerSPI.h (200865 => 200866)
--- trunk/Source/WebCore/platform/spi/cocoa/DynamicLinkerSPI.h 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebCore/platform/spi/cocoa/DynamicLinkerSPI.h 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef DynamicLinkerSPI_h
-#define DynamicLinkerSPI_h
-
-#include <mach-o/dyld.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#include <mach-o/dyld_priv.h>
-
-#else
-
-#define DYLD_IOS_VERSION_3_0 0x00030000
-#define DYLD_IOS_VERSION_4_2 0x00040200
-#define DYLD_IOS_VERSION_5_0 0x00050000
-#define DYLD_IOS_VERSION_6_0 0x00060000
-#define DYLD_IOS_VERSION_7_0 0x00070000
-#define DYLD_IOS_VERSION_9_0 0x00090000
-
-#endif
-
-EXTERN_C uint32_t dyld_get_program_sdk_version();
-
-#endif // DynamicLinkerSPI_h
Modified: trunk/Source/WebKit/ios/ChangeLog (200865 => 200866)
--- trunk/Source/WebKit/ios/ChangeLog 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit/ios/ChangeLog 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,3 +1,17 @@
+2016-05-13 Beth Dakin <[email protected]>
+
+ Add dyldSPI.h for linked on or after checks, and add one for link preview
+ https://bugs.webkit.org/show_bug.cgi?id=157401
+ -and corresponding-
+ rdar://problem/26253396
+
+ Reviewed by Darin Adler.
+
+ This patch removes DynamicLinkerSPI.h and replaces it with
+ wtf/spi/darwin/dyldSPI.h
+
+ * Misc/WebUIKitSupport.mm:
+
2016-05-06 Simon Fraser <[email protected]>
Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
Modified: trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm (200865 => 200866)
--- trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2016-05-13 18:29:52 UTC (rev 200866)
@@ -33,7 +33,6 @@
#import "WebPlatformStrategies.h"
#import "WebSystemInterface.h"
#import "WebViewPrivate.h"
-#import <WebCore/DynamicLinkerSPI.h>
#import <WebCore/PathUtilities.h>
#import <WebCore/ResourceRequest.h>
#import <WebCore/Settings.h>
@@ -41,6 +40,7 @@
#import <WebCore/WebCoreSystemInterface.h>
#import <WebCore/WebCoreThreadSystemInterface.h>
#import <WebCore/break_lines.h>
+#import <wtf/spi/darwin/dyldSPI.h>
#import <runtime/InitializeThreading.h>
Modified: trunk/Source/WebKit/mac/ChangeLog (200865 => 200866)
--- trunk/Source/WebKit/mac/ChangeLog 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,3 +1,17 @@
+2016-05-13 Beth Dakin <[email protected]>
+
+ Add dyldSPI.h for linked on or after checks, and add one for link preview
+ https://bugs.webkit.org/show_bug.cgi?id=157401
+ -and corresponding-
+ rdar://problem/26253396
+
+ Reviewed by Darin Adler.
+
+ This patch removes DynamicLinkerSPI.h and replaces it with
+ wtf/spi/darwin/dyldSPI.h
+
+ * WebView/WebView.mm:
+
2016-05-13 Tina Liu <[email protected]>
Revert r199691.
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (200865 => 200866)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-05-13 18:29:52 UTC (rev 200866)
@@ -209,6 +209,7 @@
#import <wtf/RefPtr.h>
#import <wtf/RunLoop.h>
#import <wtf/StdLibExtras.h>
+#import <wtf/spi/darwin/dyldSPI.h>
#if !PLATFORM(IOS)
#import "WebContextMenuClient.h"
Modified: trunk/Source/WebKit2/ChangeLog (200865 => 200866)
--- trunk/Source/WebKit2/ChangeLog 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-13 18:29:52 UTC (rev 200866)
@@ -1,3 +1,16 @@
+2016-05-13 Beth Dakin <[email protected]>
+
+ Add dyldSPI.h for linked on or after checks, and add one for link preview
+ https://bugs.webkit.org/show_bug.cgi?id=157401
+
+ Reviewed by Darin Adler.
+
+ Set _allowsLinkPreview to YES for programs linked on or after
+ firstSDKVersionWithLinkPreviewEnabledByDefault.
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+
2016-05-13 Jer Noble <[email protected]>
Fullscreen view attempts to resize when in 2-up mode
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (200865 => 200866)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-05-13 18:29:52 UTC (rev 200866)
@@ -232,7 +232,7 @@
/*! @abstract A Boolean value indicating whether link preview is allowed for any
links inside this WKWebView.
- @discussion The default value is NO on iOS and YES on Mac.
+ @discussion The default value is YES on Mac and iOS.
*/
@property (nonatomic) BOOL allowsLinkPreview WK_AVAILABLE(10_11, 9_0);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (200865 => 200866)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-13 18:11:42 UTC (rev 200865)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-13 18:29:52 UTC (rev 200866)
@@ -95,6 +95,7 @@
#import <wtf/Optional.h>
#import <wtf/RetainPtr.h>
#import <wtf/TemporaryChange.h>
+#import <wtf/spi/darwin/dyldSPI.h>
#if PLATFORM(IOS)
#import "_WKWebViewPrintFormatter.h"
@@ -111,7 +112,6 @@
#import "WebVideoFullscreenManagerProxy.h"
#import <UIKit/UIApplication.h>
#import <WebCore/CoreGraphicsSPI.h>
-#import <WebCore/DynamicLinkerSPI.h>
#import <WebCore/FrameLoaderTypes.h>
#import <WebCore/InspectorOverlay.h>
#import <WebCore/QuartzCoreSPI.h>
@@ -159,6 +159,10 @@
#endif // PLATFORM(IOS)
+#if PLATFORM(IOS)
+static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
+#endif
+
#if PLATFORM(MAC)
#import "WKTextFinderClient.h"
#import "WKViewInternal.h"
@@ -490,6 +494,9 @@
[self addSubview:_scrollView.get()];
+ static uint32_t programSDKVersion = dyld_get_program_sdk_version();
+ _allowsLinkPreview = programSDKVersion >= firstSDKVersionWithLinkPreviewEnabledByDefault;
+
_contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds processPool:processPool configuration:WTFMove(pageConfiguration) webView:self]);
_page = [_contentView page];
