Modified: trunk/Source/WebKit2/ChangeLog (213427 => 213428)
--- trunk/Source/WebKit2/ChangeLog 2017-03-04 19:53:01 UTC (rev 213427)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-04 21:05:31 UTC (rev 213428)
@@ -1,5 +1,19 @@
2017-03-04 Aakash Jain <[email protected]>
+ Add symbols required by TAPI from Shared/API/Cocoa/WebKit.m in a header file
+ https://bugs.webkit.org/show_bug.cgi?id=169162
+
+ Reviewed by Alexey Proskuryakov.
+
+ The symbols from binary and headers should match precisely, otherwise TAPI would
+ complain. There are few symbols which are not actually needed in header file, but
+ we still need to add them in a header file to make TAPI happy.
+
+ * Platform/ExtraPublicSymbolsForTAPI.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj: Added ExtraPublicSymbolsForTAPI.h
+
+2017-03-04 Aakash Jain <[email protected]>
+
Add symbols required by TAPI in a header file
https://bugs.webkit.org/show_bug.cgi?id=169113
<rdar://problem/30772033>
Added: trunk/Source/WebKit2/Platform/ExtraPublicSymbolsForTAPI.h (0 => 213428)
--- trunk/Source/WebKit2/Platform/ExtraPublicSymbolsForTAPI.h (rev 0)
+++ trunk/Source/WebKit2/Platform/ExtraPublicSymbolsForTAPI.h 2017-03-04 21:05:31 UTC (rev 213428)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#pragma once
+
+// FIXME: Remove these after <rdar://problem/30772200> is fixed.
+#define DECLARE_INSTALL_NAME(major, minor) \
+extern __attribute__((visibility("default"))) const char install_name_ ##major## _ ##minor __asm("$ld$install_name$os" #major "." #minor "$/System/Library/PrivateFrameworks/WebKit.framework/WebKit");
+
+DECLARE_INSTALL_NAME(4, 3);
+DECLARE_INSTALL_NAME(5, 0);
+DECLARE_INSTALL_NAME(5, 1);
+DECLARE_INSTALL_NAME(6, 0);
+DECLARE_INSTALL_NAME(6, 1);
+DECLARE_INSTALL_NAME(7, 0);
+DECLARE_INSTALL_NAME(7, 1);
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (213427 => 213428)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-03-04 19:53:01 UTC (rev 213427)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-03-04 21:05:31 UTC (rev 213428)
@@ -4231,6 +4231,7 @@
E4E8648E1B1673FB00C82F40 /* VersionChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VersionChecks.h; sourceTree = "<group>"; };
E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VersionChecks.mm; sourceTree = "<group>"; };
ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = "<group>"; };
+ ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = "<group>"; };
ECA680D71E690DF800731D20 /* WebProcessCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebProcessCocoa.h; sourceTree = "<group>"; };
F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
F43370961E4D6A4400052B0E /* _WKTestingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKTestingDelegate.h; sourceTree = "<group>"; };
@@ -7102,6 +7103,7 @@
CE1A0BCA1A48E6C60054EF74 /* spi */,
51B15A7D138439B200321AD8 /* unix */,
ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */,
+ ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */,
51A7F2F4125BF8D4008AEB1D /* Logging.cpp */,
51A7F2F2125BF820008AEB1D /* Logging.h */,
0FDCD7F61D47E92A009F08BC /* LogInitialization.h */,
