+2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * Source/Makefile:
+ Build WebKit.xcodeproj before WebKit2.xcodeproj.
+
+ * WebKit.xcworkspace/xcshareddata/xcschemes/:
+ Ditto.
+
2014-05-06 David Kilzer <ddkilzer@apple.com>
Add Makefile targets for copying static libraries (LLVM and WKSI)
-MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit2 WebKit
+MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
ifneq (,$(findstring iphoneos,$(SDKROOT)))
MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
+2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ Remove the WebKit framework, it lives inside WebKit2 now.
+
2014-05-07 Brent Fulgham <bfulgham@apple.com>
[Win] Unreviewed 64-bit build fix.
1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */; };
1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; };
1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; };
- 1A739036190AE622002E3105 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739034190AE5D4002E3105 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739037190AE674002E3105 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; };
1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */; };
1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */; };
1AB1DAC218BC0232004B6A9F /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */; };
- 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKit.m */; };
1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; };
1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */; };
1AEA66D80DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */; };
F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F834AAD60E64B1C700E2737C /* WebTextIterator.mm */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 9398100A0824BF01008DF038;
- remoteInfo = WebKit;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
065AD5A10B0C32C7005A2B1D /* WebContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebContextMenuClient.h; sourceTree = "<group>"; };
065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = "<group>"; };
0F30985E11ECFE4500F559DF /* WebRenderLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderLayer.mm; sourceTree = "<group>"; };
14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; };
- 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; };
1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyInstance.h; sourceTree = "<group>"; };
1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyInstance.mm; sourceTree = "<group>"; };
1A4DF5200EC8C74D006BD4B4 /* WebNetscapePluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginView.h; sourceTree = "<group>"; };
1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; };
1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; };
- 1A739034190AE5D4002E3105 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
- 1A739037190AE674002E3105 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; };
1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHostedNetscapePluginView.mm; sourceTree = "<group>"; };
1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; };
1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; };
- 1AD7451218D0D24C006F3A1E /* WebKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
- 1AD7451918D0D26C006F3A1E /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
- 1AD7453D18D0D383006F3A1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandler.mm; sourceTree = "<group>"; };
1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandlerCarbon.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 1AD7451518D0D26C006F3A1E /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
939811270824BF01008DF038 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
isa = PBXGroup;
children = (
939811330824BF01008DF038 /* WebKitLegacy.framework */,
- 1AD7451918D0D26C006F3A1E /* WebKit.framework */,
);
name = Products;
sourceTree = "<group>";
F5EBC45202134BB601CA1520 /* Plugins */,
511F3FC30CECC7E200852565 /* Storage */,
F5B36B400281DE87018635CB /* WebCoreSupport */,
- 1AD7451118D0D23D006F3A1E /* WebKit Framework */,
9C7CABBB0190A37C0ECA16EA /* WebView */,
1C68F63F095B5F9C00C2984E /* WebInspector */,
F7EBEE5903F9DB2203CA0DE6 /* Carbon */,
name = Events;
sourceTree = "<group>";
};
- 1AD7451118D0D23D006F3A1E /* WebKit Framework */ = {
- isa = PBXGroup;
- children = (
- 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */,
- 1AD7453D18D0D383006F3A1E /* Info.plist */,
- 1AD7451218D0D24C006F3A1E /* WebKit.m */,
- 1A739034190AE5D4002E3105 /* WebKit.h */,
- 1A739037190AE674002E3105 /* WebKitPrivate.h */,
- );
- name = "WebKit Framework";
- path = mac/WebKitLegacy;
- sourceTree = "<group>";
- };
1C68F63F095B5F9C00C2984E /* WebInspector */ = {
isa = PBXGroup;
children = (
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
- 1A739035190AE603002E3105 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */,
- 1A739036190AE622002E3105 /* WebKit.h in Headers */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
9398100D0824BF01008DF038 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 1AD7451818D0D26C006F3A1E /* WebKit */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */;
- buildPhases = (
- 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */,
- 1A5B250818D0D90C00913729 /* Migrate Headers */,
- 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */,
- 1A739035190AE603002E3105 /* Headers */,
- 1AD7451418D0D26C006F3A1E /* Sources */,
- 1AD7451518D0D26C006F3A1E /* Frameworks */,
- 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
- 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
- 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */,
- );
- buildRules = (
- );
- dependencies = (
- 1A5B250A18D0DBD300913729 /* PBXTargetDependency */,
- );
- name = WebKit;
- productName = WebKit;
- productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */;
- productType = "com.apple.product-type.framework";
- };
9398100A0824BF01008DF038 /* WebKitLegacy */ = {
isa = PBXNativeTarget;
buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
projectDirPath = "";
projectRoot = "";
targets = (
- 1AD7451818D0D26C006F3A1E /* WebKit */,
9398100A0824BF01008DF038 /* WebKitLegacy */,
);
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
- );
- name = "Check For Inappropriate Macros in External Headers";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi";
- };
- 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
- );
- name = "Check For Framework Include Consistency";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\nexit 0;\nfi\n\n# FIXME: Once WebKit is provided by WebKit2.xcodeproj, this should be re-enabled.\nif [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [ -f ../../Tools/Scripts/check-for-webkit-framework-include-consistency ]; then\n../../Tools/Scripts/check-for-webkit-framework-include-consistency || exit $?\nfi\n";
- };
1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
shellPath = /bin/sh;
shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n # FIXME: This should be removed once faulty links have been removed on the bots.\n if [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]]; then\n rm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n fi\n\n if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n fi\nfi\n";
};
- 1A5B250818D0D90C00913729 /* Migrate Headers */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Migrate Headers";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n if [[ ${PLATFORM_NAME} == \"macosx\" ]]; then\n mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n fi\n mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n make -C mac/WebKitLegacy -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
- };
- 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
- );
- name = "Update Info.plist with version information";
- outputPaths = (
- "$(PROJECT_DIR)/mac/WebKitLegacy/Info.plist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/WebKitLegacy/Info.plist\";\nfi;\n";
- };
- 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputPaths = (
- );
- name = "Add Symlink in /System/Library/PrivateFrameworks";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n if [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\n fi\n if [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n echo \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\n exit 1\n fi\n # If the symlink already exists, remove it and create the new one in its place.\n ln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
- };
- 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputPaths = (
- WebKit.xcodeproj,
- );
- name = "Make Frameworks Symbolic Link";
- outputPaths = (
- "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
- };
1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 1AD7451418D0D26C006F3A1E /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
939810BB0824BF01008DF038 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 9398100A0824BF01008DF038 /* WebKitLegacy */;
- targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */ = {
isa = PBXVariantGroup;
};
name = Production;
};
- 1AD7453418D0D26C006F3A1E /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- 1AD7453518D0D26C006F3A1E /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- 1AD7453618D0D26C006F3A1E /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 1AD7453418D0D26C006F3A1E /* Debug */,
- 1AD7453518D0D26C006F3A1E /* Release */,
- 1AD7453618D0D26C006F3A1E /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
/* End XCConfigurationList section */
};
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/BaseLegacyProcess.xcconfig:
+ Change INSTALL_PATH to WebKit.framework.
+
+ * Configurations/BaseTarget.xcconfig:
+ Change WEBKIT2_FRAMEWORKS_DIR to WEBKIT_FRAMEWORKS_DIR and add WEBKIT_LEGACY_PRIVATE_HEADERS_DIR.
+
+ * Configurations/BaseXPCService.xcconfig:
+ Change WebKit2.framework to WebKit.framework.
+
+ * Configurations/WebKit.xcconfig: Copied from Source/WebKit2/Configurations/WebKit2.xcconfig.
+ New configuration file for WebKit.framework. Re-export WebKitLegacy.framework.
+
+ * Configurations/WebKit2.xcconfig:
+ New configuration file for the WebKit2 shim framework. Re-export WebKit.framework.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
+ Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+ Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+ * Shared/API/Cocoa/WKBrowsingContextHandle.h:
+ * Shared/API/Cocoa/WKRenderingProgressEvents.h:
+ Update header imports.
+
+ * Shared/API/Cocoa/WebKit.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.h.
+ New umbrella header. Imports the modern WebKit API as well as the legacy API.
+
+ * Shared/API/Cocoa/WebKit.m: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.m.
+ Export install name symbols on iOS.
+
+ * Shared/API/Cocoa/WebKitPrivate.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h.
+ New umbrella SPI header. Imports the modern WebKit SPI.
+
+ * Many headers:
+ Change WebKit2 includes to WebKit includes.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+ (WebKit::XPCServiceEventHandler):
+ Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+ (WebKit::XPCServiceEventHandler):
+ Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ Stop including WKPreferencesRef.h, we have a WebKit2 header that handles this workaround for us now.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::addDYLDEnvironmentAdditions):
+ (WebKit::connectToService):
+ (WebKit::createProcess):
+ (WebKit::ProcessLauncher::launchProcess):
+ Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::createPropertyListFile):
+ Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultDiskCacheDirectory):
+ Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Copy the python message scripts to the WebKit2 framework.
+ Rename WebKit2.framework to WebKit.framework everywhere.
+ Add a new WebKit2 target that builds the shim WebKit2 framework.
+ Move the build script phase that migrates WebKitLegacy headers to WebKit.
+ Add a new build script phase that adds forwarding headers from WebKit2 to WebKit.
+
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
+ Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+ * mac/MigrateHeadersFromWebKitLegacy.make: Renamed from Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make.
+ Move the makefile that migrates WebKitLegacy headers here. On OS X, it copies the header contents and on iOS it creates forarding headers.
+
+ * mac/MigrateHeadersToWebKit2.make:
+ New makefile that creates forwarding headers for the WebKit2 shim framework.
+
+ * mac/WKPreferences.h: Added.
+ Add WebKit2/WKPreferences.h header that imports WebKit2/WKPreferencesref.h.
+
+ * mac/WebKit2.m:
+ Skeleton for the WebKit2 shim framework.
+
+ * mac/Info-WebKit2.plist: Added.
+ New Info.plist file for the WebKit2 shim framework.
+
2014-05-09 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com>
[WK2] Make generate-forwarding-headers.pl work after WebKit2.framework -> WebKit.framework rename
#include "BaseTarget.xcconfig"
GCC_ENABLE_OBJC_GC = NO;
-INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework;
APP_ICON = $(APP_ICON_$(CONFIGURATION));
APP_ICON_Debug = WebKit.icns;
FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
GCC_PREFIX_HEADER = WebKit2Prefix.h;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit2
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
-NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_WEBKIT_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT_FRAMEWORKS_DIR_macosx = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(PLATFORM_NAME));
UMBRELLA_FRAMEWORKS_DIR_iphoneos = $(UMBRELLA_FRAMEWORKS_DIR_iphoneos_$(CONFIGURATION));
UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/PrivateHeaders;
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
INSTALL_PATH_ACTUAL_Normal = $(INSTALL_PATH_ACTUAL_Normal_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
-INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
+INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
+INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
INSTALL_PATH_ACTUAL_Normal_iphonesimulator = $(INSTALL_PATH_ACTUAL_Normal_iphoneos);
INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
--- /dev/null
+// Copyright (C) 2010, 2013, 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. ``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.
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = WebKit;
+INFOPLIST_FILE = Info.plist;
+
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+
+FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework MobileCoreServices -lMobileGestalt -lassertion_extension;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
+
+// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
+UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
+
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.DatabaseProcess.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+
+INSTALLHDRS_SCRIPT_PHASE = YES;
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "BaseTarget.xcconfig"
+#include "Version.xcconfig"
PRODUCT_NAME = WebKit2;
-INFOPLIST_FILE = Info.plist;
-
-INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-
-FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework MobileCoreServices -framework WebKit -lMobileGestalt -lassertion_extension;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
-
-// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
-UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
-
-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
-
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.DatabaseProcess.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-
-INSTALLHDRS_SCRIPT_PHASE = YES;
+INFOPLIST_FILE = mac/Info-WebKit2.plist;
+
+OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
+
+INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
+INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
+INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
+
+DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
+DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
+
+NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+
+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
<key>EnvironmentVariables</key>
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
</dict>
</dict>
</dict>
<key>EnvironmentVariables</key>
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
</dict>
</dict>
</dict>
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-// FIXME: Remove this __has_include check once the WebKit framework lives in the right place.
-#if defined(__has_include) && __has_include(<WebKit/WKWebView.h>)
#import <WebKit/WKBackForwardList.h>
#import <WebKit/WKBackForwardListItem.h>
#import <WebKit/WKFoundation.h>
#import <WebKit/WKUserContentController.h>
#import <WebKit/WKWebView.h>
#import <WebKit/WKWebViewConfiguration.h>
-#endif
-
#import <WebKit/WebKitLegacy.h>
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <TargetConditionals.h>
+#import "config.h"
-// FIXME: This file is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
-
-#if TARGET_OS_IPHONE
+#if PLATFORM(IOS)
#define DEFINE_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"); \
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if TARGET_OS_IPHONE
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#ifndef WKArray_h
#define WKArray_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
#ifndef WKBase_h
#define WKBase_h
-#include <WebKit2/WKDeclarationSpecifiers.h>
+#include <WebKit/WKDeclarationSpecifiers.h>
#include <stdint.h>
#if defined(BUILDING_GTK__)
-#include <WebKit2/WKBaseGtk.h>
+#include <WebKit/WKBaseGtk.h>
#endif
#if defined(WTF_USE_SOUP)
-#include <WebKit2/WKBaseSoup.h>
+#include <WebKit/WKBaseSoup.h>
#endif
#if defined(BUILDING_EFL__)
-#include <WebKit2/WKBaseEfl.h>
+#include <WebKit/WKBaseEfl.h>
#endif
#if defined(__APPLE__)
-#include <WebKit2/WKBaseMac.h>
+#include <WebKit/WKBaseMac.h>
#endif
/* WebKit2 shared types */
#ifndef WKCertificateInfo_h
#define WKCertificateInfo_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKConnectionRef_h
#define WKConnectionRef_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKContextMenuItem_h
#define WKContextMenuItem_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContextMenuItemTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKContextMenuItemTypes.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKData_h
#define WKData_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
#ifndef WKDictionary_h
#define WKDictionary_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
#ifndef WKError_h
#define WKError_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKEvent_h
#define WKEvent_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKGeometry_h
#define WKGeometry_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKImage_h
#define WKImage_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKMutableArray_h
#define WKMutableArray_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
#ifndef __cplusplus
#ifndef WKMutableDictionary_h
#define WKMutableDictionary_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKNumber_h
#define WKNumber_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPluginInformation_h
#define WKPluginInformation_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKRenderLayer_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKRenderObject_h
#define WKRenderObject_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKSecurityOrigin_h
#define WKSecurityOrigin_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKSerializedScriptValue_h
#include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKSerializedScriptValuePrivate_h
#define WKSerializedScriptValuePrivate_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKString_h
#define WKString_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
#ifndef __cplusplus
#define WKStringPrivate_h
#include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKType_h
#define WKType_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKURL_h
#define WKURL_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKURLRequest_h
#define WKURLRequest_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKURLResponse_h
#define WKURLResponse_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKUserContentURLPattern_h
#include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKErrorCF_h
#include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKStringCF_h
#include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKURLCF_h
#include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKImageCG_h
#include <CoreGraphics/CGImage.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKImage.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKImage.h>
#ifdef __cplusplus
extern "C" {
#define WKCertificateInfoMac_h
#include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKObjCTypeWrapperRef_h
#include <Foundation/Foundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKURLRequestNS_h
#include <Foundation/Foundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKURLResponseNS_h
#include <Foundation/Foundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKWebArchive_h
#define WKWebArchive_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
#ifndef WKWebArchiveResource_h
#define WKWebArchiveResource_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <stddef.h>
exit(EXIT_FAILURE);
}
- CFBundleRef webKit2Bundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit2"));
+ CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
- InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKit2Bundle, entryPointFunctionName));
+ InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
if (!initializerFunctionPtr) {
- NSLog(@"Unable to find entry point in WebKit2.framework with name: %@", (NSString *)entryPointFunctionName);
+ NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (NSString *)entryPointFunctionName);
exit(EXIT_FAILURE);
}
assert(type == XPC_TYPE_DICTIONARY);
if (!strcmp(xpc_dictionary_get_string(event, "message-name"), "bootstrap")) {
- CFBundleRef webKit2Bundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit2"));
+ CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
- InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKit2Bundle, entryPointFunctionName));
+ InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
if (!initializerFunctionPtr) {
NSLog(@"Unable to find entry point in WebKit2.framework with name: %@", (NSString *)entryPointFunctionName);
exit(EXIT_FAILURE);
#ifndef WKApplicationCacheManager_h
#define WKApplicationCacheManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKAuthenticationChallenge_h
#define WKAuthenticationChallenge_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKAuthenticationDecisionListener_h
#define WKAuthenticationDecisionListener_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKBackForwardListItemRef_h
#define WKBackForwardListItemRef_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKBackForwardListRef_h
#define WKBackForwardListRef_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKContext_h
#define WKContext_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContextConnectionClient.h>
-#include <WebKit2/WKContextDownloadClient.h>
-#include <WebKit2/WKContextHistoryClient.h>
-#include <WebKit2/WKContextInjectedBundleClient.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKContextConnectionClient.h>
+#include <WebKit/WKContextDownloadClient.h>
+#include <WebKit/WKContextHistoryClient.h>
+#include <WebKit/WKContextInjectedBundleClient.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKContextConnectionClient_h
#define WKContextConnectionClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
typedef void (*WKContextDidCreateConnection)(WKContextRef context, WKConnectionRef connection, const void* clientInfo);
#ifndef WKContextDownloadClient_h
#define WKContextDownloadClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
typedef void (*WKContextDownloadDidStartCallback)(WKContextRef context, WKDownloadRef download, const void *clientInfo);
typedef void (*WKContextDownloadDidReceiveAuthenticationChallengeCallback)(WKContextRef context, WKDownloadRef download, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo);
#ifndef WKContextHistoryClient_h
#define WKContextHistoryClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
typedef void (*WKContextDidNavigateWithNavigationDataCallback)(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo);
typedef void (*WKContextDidPerformClientRedirectCallback)(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo);
#ifndef WKContextInjectedBundleClient_h
#define WKContextInjectedBundleClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
// Injected Bundle Client
typedef void (*WKContextDidReceiveMessageFromInjectedBundleCallback)(WKContextRef page, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo);
#ifndef WKContextPrivate_h
#define WKContextPrivate_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContext.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKContext.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKCookieManager_h
#define WKCookieManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKCredential_h
#define WKCredential_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKCredentialTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKCredentialTypes.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKDatabaseManager_h
#define WKDatabaseManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKDownload_h
#define WKDownload_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKFormSubmissionListener_h
#define WKFormSubmissionListener_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKFrame_h
#define WKFrame_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKFramePolicyListener_h
#define WKFramePolicyListener_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKGeolocationManager_h
#define WKGeolocationManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKGeolocationPermissionRequest_h
#define WKGeolocationPermissionRequest_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKGeolocationPosition_h
#define WKGeolocationPosition_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKHitTestResult_h
#define WKHitTestResult_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKIconDatabase_h
#define WKIconDatabase_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKInspector_h
#define WKInspector_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKKeyValueStorageManager_h
#define WKKeyValueStorageManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKMediaCacheManager_h
#define WKMediaCacheManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKNavigationDataRef_h
#define WKNavigationDataRef_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKNotification_h
#define WKNotification_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKNotificationManager_h
#include "WKNotificationProvider.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKNotificationPermissionRequest_h
#define WKNotificationPermissionRequest_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKNotificationProvider_h
#define WKNotificationProvider_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKOpenPanelParameters_h
#define WKOpenPanelParameters_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKOpenPanelResultListener_h
#define WKOpenPanelResultListener_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKOriginDataManager_h
#define WKOriginDataManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPage_h
#define WKPage_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKFindOptions.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKNativeEvent.h>
-#include <WebKit2/WKPageContextMenuClient.h>
-#include <WebKit2/WKPageFindClient.h>
-#include <WebKit2/WKPageFindMatchesClient.h>
-#include <WebKit2/WKPageFormClient.h>
-#include <WebKit2/WKPageLoadTypes.h>
-#include <WebKit2/WKPageLoaderClient.h>
-#include <WebKit2/WKPagePolicyClient.h>
-#include <WebKit2/WKPageUIClient.h>
-#include <WebKit2/WKPageVisibilityTypes.h>
-#include <WebKit2/WKSessionRef.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKFindOptions.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKNativeEvent.h>
+#include <WebKit/WKPageContextMenuClient.h>
+#include <WebKit/WKPageFindClient.h>
+#include <WebKit/WKPageFindMatchesClient.h>
+#include <WebKit/WKPageFormClient.h>
+#include <WebKit/WKPageLoadTypes.h>
+#include <WebKit/WKPageLoaderClient.h>
+#include <WebKit/WKPagePolicyClient.h>
+#include <WebKit/WKPageUIClient.h>
+#include <WebKit/WKPageVisibilityTypes.h>
+#include <WebKit/WKSessionRef.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKPageContextMenuClient_h
#define WKPageContextMenuClient_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPageFindClient_h
#define WKPageFindClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPageFindMatchesClient_h
#define WKPageFindMatchesClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPageFormClient_h
#define WKPageFormClient_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPageGroup_h
#define WKPageGroup_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKUserContentInjectedFrames.h>
-#include <WebKit2/WKUserScriptInjectionTime.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKUserContentInjectedFrames.h>
+#include <WebKit/WKUserScriptInjectionTime.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPageLoaderClient_h
#define WKPageLoaderClient_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKPageLoadTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKPageLoadTypes.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPagePolicyClient_h
#define WKPagePolicyClient_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKPageLoadTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKPageLoadTypes.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPagePrivate_h
#define WKPagePrivate_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKPage.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKPage.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPageUIClient_h
#define WKPageUIClient_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKNativeEvent.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKNativeEvent.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPluginSiteDataManager_h
#define WKPluginSiteDataManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPreferencesRef_h
#define WKPreferencesRef_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifndef __cplusplus
#include <stdbool.h>
#ifndef WKPreferencesPrivate_h
#define WKPreferencesPrivate_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKProtectionSpace_h
#define WKProtectionSpace_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKProtectionSpaceTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKProtectionSpaceTypes.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKProtectionSpaceTypes_h
#define WKProtectionSpaceTypes_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKResourceCacheManager_h
#define WKResourceCacheManager_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKSessionRef_h
#define WKSessionRef_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WebKit2_C_h
#define WebKit2_C_h
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKType.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKType.h>
-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBackForwardListRef.h>
-#include <WebKit2/WKBackForwardListItemRef.h>
-#include <WebKit2/WKConnectionRef.h>
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKDictionary.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKFormSubmissionListener.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKFramePolicyListener.h>
-#include <WebKit2/WKGeolocationManager.h>
-#include <WebKit2/WKGeolocationPermissionRequest.h>
-#include <WebKit2/WKGeolocationPosition.h>
-#include <WebKit2/WKHitTestResult.h>
-#include <WebKit2/WKMutableArray.h>
-#include <WebKit2/WKMutableDictionary.h>
-#include <WebKit2/WKNavigationDataRef.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKOpenPanelParameters.h>
-#include <WebKit2/WKOpenPanelResultListener.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKPreferencesRef.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
-#include <WebKit2/WKURLRequest.h>
-#include <WebKit2/WKURLResponse.h>
+#include <WebKit/WKArray.h>
+#include <WebKit/WKBackForwardListRef.h>
+#include <WebKit/WKBackForwardListItemRef.h>
+#include <WebKit/WKConnectionRef.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKData.h>
+#include <WebKit/WKDictionary.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKFormSubmissionListener.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKFramePolicyListener.h>
+#include <WebKit/WKGeolocationManager.h>
+#include <WebKit/WKGeolocationPermissionRequest.h>
+#include <WebKit/WKGeolocationPosition.h>
+#include <WebKit/WKHitTestResult.h>
+#include <WebKit/WKMutableArray.h>
+#include <WebKit/WKMutableDictionary.h>
+#include <WebKit/WKNavigationDataRef.h>
+#include <WebKit/WKNumber.h>
+#include <WebKit/WKOpenPanelParameters.h>
+#include <WebKit/WKOpenPanelResultListener.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKPageGroup.h>
+#include <WebKit/WKPreferencesRef.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKURL.h>
+#include <WebKit/WKURLRequest.h>
+#include <WebKit/WKURLResponse.h>
#if defined(__OBJC__) && __OBJC__
-#import <WebKit2/WKView.h>
+#import <WebKit/WKView.h>
#elif !(defined(__APPLE__) && __APPLE__)
-#include <WebKit2/WKView.h>
+#include <WebKit/WKView.h>
#endif
#endif /* WebKit2_C_h */
#include <CoreFoundation/CFArray.h>
#include <CoreGraphics/CGImage.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKContextPrivateMac_h
#define WKContextPrivateMac_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
*/
#import <AppKit/NSWindow.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKInspector.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
+#import <WebKit/WKInspector.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKPagePrivateMac_h
#define WKPagePrivateMac_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#include <sys/types.h>
#ifdef __cplusplus
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
-#import <WebKit2/WKBackForwardListItem.h>
+#import <WebKit/WKBackForwardListItem.h>
/*! @abstract A @link WKWebView @/link's list of previously-visited webpages that can be reached by
going back or forward.
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKBackForwardList.h>
+#import <WebKit/WKBackForwardList.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKFoundation.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKRenderingProgressEvents.h>
+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKRenderingProgressEvents.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextController.h>
#if WK_API_ENABLED
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
typedef NS_ENUM(NSUInteger, WKBrowsingContextPaginationMode) {
WKPaginationModeUnpaginated,
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#import <Foundation/Foundation.h>
-#import <WebKit2/WKUserScriptInjectionTime.h>
+#import <WebKit/WKUserScriptInjectionTime.h>
WK_API_CLASS
@interface WKBrowsingContextGroup : NSObject
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextGroup.h>
#if WK_API_ENABLED
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
@interface WKBrowsingContextGroup (Private)
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKNavigationData.h>
+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKNavigationData.h>
@protocol WKBrowsingContextHistoryDelegate <NSObject>
@optional
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextController.h>
@class WKBackForwardListItem;
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKBrowsingContextLoadDelegate.h>
+#import <WebKit/WKBrowsingContextLoadDelegate.h>
@protocol WKBrowsingContextLoadDelegatePrivate <WKBrowsingContextLoadDelegate>
@optional
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
@class WKBrowsingContextController;
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKNavigationAction.h>
+#import <WebKit/WKNavigationAction.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <WebKit2/WKNavigationDataRef.h>
+#include <WebKit/WKNavigationDataRef.h>
#ifdef __OBJC__
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKNavigationDelegate.h>
-#import <WebKit2/WKWebViewPrivate.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKWebViewPrivate.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WKPreferences_h
-#define WKPreferences_h
-
-#include <WebKit2/WKPreferencesRef.h>
-
-#ifdef __OBJC__
-
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
@end
#endif // WK_API_ENABLED
-
-#endif // defined(__OBJC__)
-
-#endif
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <WebKit2/WKPreferencesRefPrivate.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
#ifdef __OBJC__
-#import <WebKit2/WKPreferences.h>
+#import <WebKit/WKPreferences.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#import <Foundation/Foundation.h>
-#import <WebKit2/WKConnection.h>
+#import <WebKit/WKConnection.h>
@class WKProcessGroup;
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKProcessGroup.h>
+#import <WebKit/WKProcessGroup.h>
#if WK_API_ENABLED
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
#if TARGET_OS_IPHONE
@class WKGeolocationProviderIOS;
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKProcessPool.h>
+#import <WebKit/WKProcessPool.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKScriptMessage.h>
+#import <WebKit/WKScriptMessage.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
WK_API_CLASS
@interface WKTypeRefWrapper : NSObject
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKUIDelegate.h>
+#import <WebKit/WKUIDelegate.h>
#if WK_API_ENABLED
-#import <WebKit2/_WKActivatedElementInfo.h>
+#import <WebKit/_WKActivatedElementInfo.h>
@protocol WKUIDelegatePrivate <WKUIDelegate>
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKUserContentController.h>
+#import <WebKit/WKUserContentController.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if TARGET_OS_IPHONE
#import <UIKit/UIKit.h>
#else
#import <Cocoa/Cocoa.h>
#endif
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
@class WKBrowsingContextController;
@class WKBrowsingContextGroup;
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKBase.h>
-#import <WebKit2/WKView.h>
+#import <WebKit/WKBase.h>
+#import <WebKit/WKView.h>
@interface WKView (Private)
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKWebViewConfiguration.h>
+#import <WebKit/WKWebViewConfiguration.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKWebView.h>
+#import <WebKit/WKWebView.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKBrowsingContextLoadDelegate.h>
-#import <WebKit2/WKBrowsingContextPolicyDelegate.h>
-#import <WebKit2/WKConnection.h>
-#import <WebKit2/WKFoundation.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKView.h>
+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextLoadDelegate.h>
+#import <WebKit/WKBrowsingContextPolicyDelegate.h>
+#import <WebKit/WKConnection.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKView.h>
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#if TARGET_OS_IPHONE
-#import <WebKit2/_WKActivatedElementInfo.h>
+#import <WebKit/_WKActivatedElementInfo.h>
typedef void (^WKElementActionHandler)(_WKActivatedElementInfo *);
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#import <Foundation/Foundation.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
WK_EXPORT extern NSString * const _WKRecoveryAttempterErrorKey;
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#ifndef WKRetainPtr_h
#define WKRetainPtr_h
-#include <WebKit2/WKType.h>
+#include <WebKit/WKType.h>
#include <algorithm>
namespace WebKit {
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], _NSGetMachExecuteHeader()->cputype);
environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
- NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
- NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
+ NSBundle *webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
+ NSString *frameworksPath = [[webKitBundle bundlePath] stringByDeletingLastPathComponent];
// To make engineering builds work, if the path is outside of /System set up
// DYLD_FRAMEWORK_PATH to pick up other frameworks, but don't do it for the
NSString *processShimPathNSString = nil;
#if ENABLE(NETSCAPE_PLUGIN_API)
if (launchOptions.processType == ProcessLauncher::PluginProcess) {
- NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
+ NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if ENABLE(NETWORK_PROCESS)
if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
- NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
+ NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
} else
#endif // ENABLE(NETWORK_PROCESS)
if (launchOptions.processType == ProcessLauncher::WebProcess) {
- NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"WebProcess.app"];
+ NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
xpc_object_t bootstrapMessage = xpc_dictionary_create(0, 0, 0);
xpc_dictionary_set_string(bootstrapMessage, "message-name", "bootstrap");
- xpc_dictionary_set_string(bootstrapMessage, "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] executablePath] fileSystemRepresentation]);
+ xpc_dictionary_set_string(bootstrapMessage, "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] executablePath] fileSystemRepresentation]);
xpc_dictionary_set_mach_send(bootstrapMessage, "server-port", listeningPort);
xpc_dictionary_set_string(bootstrapMessage, "client-identifier", clientIdentifier.data());
xpc_dictionary_set_string(bootstrapMessage, "ui-process-name", [[[NSProcessInfo processInfo] processName] UTF8String]);
// Insert a send right so we can send to it.
mach_port_insert_right(mach_task_self(), listeningPort, listeningPort, MACH_MSG_TYPE_MAKE_SEND);
- NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
+ NSBundle *webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
NSString *processPath = nil;
switch (launchOptions.processType) {
case ProcessLauncher::WebProcess:
- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"WebProcess.app"];
+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
break;
#if ENABLE(NETSCAPE_PLUGIN_API)
case ProcessLauncher::PluginProcess:
- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
break;
#endif
#if ENABLE(NETWORK_PROCESS)
case ProcessLauncher::NetworkProcess:
- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
break;
#endif
#if ENABLE(DATABASE_PROCESS)
case ProcessLauncher::DatabaseProcess:
- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
break;
#endif
}
- NSString *frameworkExecutablePath = [webKit2Bundle executablePath];
+ NSString *frameworkExecutablePath = [webKitBundle executablePath];
NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
if (tryPreexistingProcess(m_launchOptions, this, &ProcessLauncher::didFinishLaunchingProcess))
return;
- bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
+ bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
if (m_launchOptions.useXPC) {
createService(m_launchOptions, isWebKitDevelopmentBuild, this, &ProcessLauncher::didFinishLaunchingProcess);
bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
{
- NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
+ NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
const char* frameworkExecutablePath = [[webKit2Bundle executablePath] fileSystemRepresentation];
#import <UIKit/UIActionSheet.h>
#import <UIKit/UIPopoverController.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
#import <wtf/RetainPtr.h>
@protocol WKActionSheetDelegate;
#if PLATFORM(IOS)
#import <Foundation/NSObject.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
namespace WebKit {
class WebContext;
#import "WebSecurityOrigin.h"
#import <WebGeolocationPosition.h>
#import <WebCore/GeolocationPosition.h>
-#import <WebKit2/WKGeolocationPermissionRequest.h>
+#import <WebKit/WKGeolocationPermissionRequest.h>
#import <wtf/Assertions.h>
#import <wtf/PassRefPtr.h>
#import <wtf/RefPtr.h>
{
RetainPtr<NSString> cachePath = adoptNS((NSString *)WKCopyFoundationCacheDirectory());
if (!cachePath)
- cachePath = @"~/Library/Caches/com.apple.WebKit2.WebProcess";
+ cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
return [cachePath stringByStandardizingPath];
}
BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
);
dependencies = (
+ 1A6280F619199865006AD9F9 /* PBXTargetDependency */,
1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */,
51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */,
510CC8481613C85300D03ED3 /* PBXTargetDependency */,
0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */; };
0F931C1D18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */; };
0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
- 0FC08572187CE0B100780D86 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
- 0FC08573187CE0B300780D86 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
- 0FC08574187CE0B400780D86 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
- 0FC08575187CE0B600780D86 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
0FCB4E4618BBE044000FCFC9 /* PageClientImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */; };
0FCB4E4718BBE044000FCFC9 /* PageClientImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */; };
0FCB4E4818BBE044000FCFC9 /* WKActionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3818BBE044000FCFC9 /* WKActionSheet.h */; };
1A043DC2124FF87500FFBFB5 /* PluginProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043DC0124FF87500FFBFB5 /* PluginProxy.cpp */; };
1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */; };
1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */; };
+ 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
+ 1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
+ 1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
+ 1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */; };
1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */; };
1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */; };
+ 1A6280C51919949F006AD9F9 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C41919949F006AD9F9 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A6280F019199800006AD9F9 /* WebKit2.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280EE19199800006AD9F9 /* WebKit2.m */; };
+ 1A6280F31919982A006AD9F9 /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280F21919982A006AD9F9 /* WebKit.m */; };
1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */; };
1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */; };
1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */; };
1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */; };
1AD8790A18B6C38A006CAFD7 /* WKUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
1ADCB86A189831B30022EE5A /* NavigationActionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADCB868189831B30022EE5A /* NavigationActionData.cpp */; };
1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADCB869189831B30022EE5A /* NavigationActionData.h */; };
1ADF591A1890528E0043C145 /* WKWebViewConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */; };
37608823150414F700FC82C7 /* WKRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 37608821150414F700FC82C7 /* WKRenderObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
- 3766F9F0189A1248003CF19B /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BC87DFA91018101400564216 /* libicucore.dylib */; };
3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */; };
3769079E18F340A2001DFF04 /* APIInjectedBundleFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */; };
37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
- 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */; };
51F7DC41180CC93600212CA3 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
- 51F7DC44180CC93600212CA3 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+ 51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
51FA1E1D180CCADE00C44BE9 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
51FA1E1F180CCADE00C44BE9 /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
51FA1E23180CCADE00C44BE9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */; };
7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */; };
7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBBC1746B04C000C1C45 /* WKTypeRefWrapper.mm */; };
7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBD1746B04C000C1C45 /* WKTypeRefWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
7CD622771739D863005BD7FF /* PluginSandboxProfile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */; };
BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82838A16B45EF200A278FE /* PluginProcessMain.mm */; };
BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */; };
BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */; };
- BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+ BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */; };
- BC82844F16B5089800A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+ BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */; };
BC8452A81162C80900CAB9B5 /* DrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8452A61162C80900CAB9B5 /* DrawingArea.h */; };
BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */; };
BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
- BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+ BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD25F1511D6BDE100169B0E /* WKBundleFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCD25F1811D6BDE100169B0E /* WKBundleFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */; };
BCD3675C148C26C000447E87 /* WebConnectionToUIProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE9C0CF1485965D00E33D61 /* WebConnectionToUIProcess.cpp */; };
- BCD597D0112B56AC00EC8C23 /* WKPreferencesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BCD597D0112B56AC00EC8C23 /* WKPreferencesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597CF112B56AC00EC8C23 /* WKPreferences.cpp */; };
BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597D4112B56DC00EC8C23 /* WKPage.cpp */; };
BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597D5112B56DC00EC8C23 /* WKPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; };
BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
BCDB86C11200FB97007254BE /* APIURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* APIURL.h */; };
- BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
remoteGlobalIDString = 1A50DB1D110A3BDC000D3FE5;
remoteInfo = WebProcess;
};
+ 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+ remoteInfo = WebKit;
+ };
+ 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 1A6280CF191997BD006AD9F9;
+ remoteInfo = WebKit2;
+ };
37F7407812721F740093869B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
+ 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = PrivateHeaders/webkit2;
+ dstSubfolderSpec = 1;
+ files = (
+ 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,
+ 1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */,
+ 1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */,
+ 1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */,
+ );
+ name = "Copy Message Generation Scripts";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
1A50DB70110A3D67000D3FE5 /* Copy Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = WebKit2.framework;
+ dstPath = WebKit.framework;
dstSubfolderSpec = 1;
files = (
510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
name = "Copy WebProcessShim";
runOnlyForDeploymentPostprocessing = 0;
};
- 5D1A239015E75B100023E981 /* Copy Message Generation Scripts */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = PrivateHeaders/webkit2;
- dstSubfolderSpec = 1;
- files = (
- 0FC08572187CE0B100780D86 /* __init__.py in Copy Message Generation Scripts */,
- 0FC08573187CE0B300780D86 /* messages.py in Copy Message Generation Scripts */,
- 0FC08574187CE0B400780D86 /* model.py in Copy Message Generation Scripts */,
- 0FC08575187CE0B600780D86 /* parser.py in Copy Message Generation Scripts */,
- );
- name = "Copy Message Generation Scripts";
- runOnlyForDeploymentPostprocessing = 0;
- };
7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
1A4F976E100E7B6600637A18 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigation.mm; sourceTree = "<group>"; };
1A5B1C4F1898606F004FCF9B /* WKNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigation.h; sourceTree = "<group>"; };
1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDocumentLoader.cpp; sourceTree = "<group>"; };
1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkProvider.messages.in; sourceTree = "<group>"; };
1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProviderMessageReceiver.cpp; sourceTree = "<group>"; };
1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProviderMessages.h; sourceTree = "<group>"; };
+ 1A6280C41919949F006AD9F9 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
+ 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
+ 1A6280D0191997BD006AD9F9 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-WebKit2.plist"; sourceTree = "<group>"; };
+ 1A6280EE19199800006AD9F9 /* WebKit2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit2.m; sourceTree = "<group>"; };
+ 1A6280F21919982A006AD9F9 /* WebKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableBitmap.cpp; sourceTree = "<group>"; };
1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareableBitmap.h; sourceTree = "<group>"; };
1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawingArea.messages.in; sourceTree = "<group>"; };
1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeatures.h; sourceTree = "<group>"; };
1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesInternal.h; sourceTree = "<group>"; };
1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUIDelegate.h; sourceTree = "<group>"; };
+ 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */ = {isa = PBXFileReference; lastKnownFileType = text; path = MigrateHeadersToWebKit2.make; sourceTree = "<group>"; };
+ 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
1ADCB868189831B30022EE5A /* NavigationActionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationActionData.cpp; sourceTree = "<group>"; };
1ADCB869189831B30022EE5A /* NavigationActionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationActionData.h; sourceTree = "<group>"; };
1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewConfiguration.mm; sourceTree = "<group>"; };
86F9536218FF550B001DB2EF /* ProcessAssertion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ProcessAssertion.mm; path = ios/ProcessAssertion.mm; sourceTree = "<group>"; };
8CFECE931490F140002AAA32 /* EditorState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorState.cpp; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 8DC2EF5B0486A6940098B216 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMemorySampler.mac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
905620E812BC248B000799B6 /* WebMemorySampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMemorySampler.cpp; sourceTree = "<group>"; };
905620E912BC248B000799B6 /* WebMemorySampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMemorySampler.h; sourceTree = "<group>"; };
BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleUserMessageCoders.h; sourceTree = "<group>"; };
BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageCoders.h; sourceTree = "<group>"; };
BCB63477116BF10600603215 /* WebKit2_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_C.h; sourceTree = "<group>"; };
- BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
+ BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
BCB9E2411120DACA00A137E0 /* WebContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContext.h; sourceTree = "<group>"; };
BCB9E2421120DACA00A137E0 /* WebContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContext.cpp; sourceTree = "<group>"; };
BCB9E2491120E15C00A137E0 /* WKContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContext.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
+ 1A6280CC191997BD006AD9F9 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
1AC25FAE12A48EA700BD2671 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
buildActionMask = 2147483647;
files = (
51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */,
- 51F7DC44180CC93600212CA3 /* WebKit2.framework in Frameworks */,
+ 51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
- 3766F9F0189A1248003CF19B /* WebCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
buildActionMask = 2147483647;
files = (
BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */,
- BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */,
+ BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- BC82844F16B5089800A278FE /* WebKit2.framework in Frameworks */,
+ BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
buildActionMask = 2147483647;
files = (
BC9FA520160D3B430054DF9A /* Foundation.framework in Frameworks */,
- BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */,
+ BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
BCDE094213272496001259FB /* PluginProcess.app */,
1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
- 8DC2EF5B0486A6940098B216 /* WebKit2.framework */,
+ 8DC2EF5B0486A6940098B216 /* WebKit.framework */,
1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */,
CDC3830617211799008A2FC3 /* WebProcessShim.dylib */,
51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */,
51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */,
+ 1A6280D0191997BD006AD9F9 /* WebKit2.framework */,
);
name = Products;
sourceTree = "<group>";
51F7DC0A180CC41100212CA3 /* DatabaseProcess */,
510CC7DA16138E0100D03ED3 /* NetworkProcess */,
1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
+ 1A6280CA19199754006AD9F9 /* WebKit2 Framework */,
C0CE729D1247E71D00BC0EC4 /* Derived Sources */,
089C1665FE841158C02AAC07 /* Resources */,
C0CE73351247F70E00BC0EC4 /* Scripts */,
5DAD7294116FF70B00EE5396 /* WebContentProcess.xcconfig */,
BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */,
BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
- BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
+ BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
+ 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */,
);
path = Configurations;
sourceTree = "<group>";
tabWidth = 8;
usesTabs = 0;
};
+ 1A6280CA19199754006AD9F9 /* WebKit2 Framework */ = {
+ isa = PBXGroup;
+ children = (
+ 1A6280EE19199800006AD9F9 /* WebKit2.m */,
+ 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */,
+ 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */,
+ 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */,
+ );
+ name = "WebKit2 Framework";
+ path = mac;
+ sourceTree = "<group>";
+ };
1A6FB7AA11E64B4900DB1371 /* Plugins */ = {
isa = PBXGroup;
children = (
37DFA6FE1810BB2D001F4A9F /* Cocoa */ = {
isa = PBXGroup;
children = (
+ 373D122118A473010066D9CC /* _WKFrameHandle.h */,
+ 373D122018A473010066D9CC /* _WKFrameHandle.mm */,
+ 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
+ A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */,
+ A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */,
+ 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */,
+ 1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */,
+ 1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */,
+ 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
+ 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
+ 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */,
1AC1338118590B0500F3EC05 /* RemoteObjectRegistry.messages.in */,
1AC1337D18590AE400F3EC05 /* RemoteObjectRegistry.mm */,
+ 1A6280C41919949F006AD9F9 /* WebKit.h */,
+ 1A6280F21919982A006AD9F9 /* WebKit.m */,
+ 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */,
1AE00D4B182D6EB000087DD7 /* WKBrowsingContextHandle.h */,
1AE00D4A182D6EB000087DD7 /* WKBrowsingContextHandle.mm */,
1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */,
1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */,
1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */,
- 373D122118A473010066D9CC /* _WKFrameHandle.h */,
- 373D122018A473010066D9CC /* _WKFrameHandle.mm */,
- 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
- A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */,
- A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */,
- 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */,
- 1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */,
- 1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */,
- 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
- 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
- 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
);
path = Cocoa;
sourceTree = "<group>";
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
+ 1A6280CD191997BD006AD9F9 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
1AC25FAC12A48EA700BD2671 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */,
1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
+ 1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */,
1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
379A873A18BBFE0F00588AF2 /* _WKElementAction.h in Headers */,
BC40761C124FF0370068F20A /* WKURLCF.h in Headers */,
BC40760C124FF0270068F20A /* WKURLRequest.h in Headers */,
BC407629124FF0400068F20A /* WKURLRequestNS.h in Headers */,
+ 1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
BC40760E124FF0270068F20A /* WKURLResponse.h in Headers */,
759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */,
productReference = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */;
productType = "com.apple.product-type.application";
};
+ 1A6280CF191997BD006AD9F9 /* WebKit2 */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */;
+ buildPhases = (
+ 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
+ 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
+ 1A6280CB191997BD006AD9F9 /* Sources */,
+ 1A6280CC191997BD006AD9F9 /* Frameworks */,
+ 1A6280CD191997BD006AD9F9 /* Headers */,
+ 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ 1A6280EC191997D3006AD9F9 /* PBXTargetDependency */,
+ );
+ name = WebKit2;
+ productName = WebKit2;
+ productReference = 1A6280D0191997BD006AD9F9 /* WebKit2.framework */;
+ productType = "com.apple.product-type.framework";
+ };
1AC25FAF12A48EA700BD2671 /* PluginProcessShim */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */;
productReference = 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */;
productType = "com.apple.product-type.application";
};
- 8DC2EF4F0486A6940098B216 /* WebKit2 */ = {
+ 8DC2EF4F0486A6940098B216 /* WebKit */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */;
+ buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */;
buildPhases = (
+ 1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */,
+ 1A07D2F51919AA8A00ECDA16 /* Make Frameworks Symbolic Link */,
8DC2EF500486A6940098B216 /* Headers */,
375A248817E5048E00C9A086 /* Postprocess WKBase.h */,
+ 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */,
8DC2EF520486A6940098B216 /* Resources */,
7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
- 5D1A239015E75B100023E981 /* Copy Message Generation Scripts */,
5D1A239215E760590023E981 /* Remove Compiled Python Files */,
8DC2EF540486A6940098B216 /* Sources */,
8DC2EF560486A6940098B216 /* Frameworks */,
5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
+ 1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */,
);
buildRules = (
);
dependencies = (
37F7407912721F740093869B /* PBXTargetDependency */,
);
- name = WebKit2;
+ name = WebKit;
productInstallPath = "$(HOME)/Library/Frameworks";
productName = WebKit2;
- productReference = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */;
+ productReference = 8DC2EF5B0486A6940098B216 /* WebKit.framework */;
productType = "com.apple.product-type.framework";
};
BC3DE46515A91763008D26FC /* WebContent */ = {
projectRoot = "";
targets = (
1A50DB38110A3C13000D3FE5 /* All */,
- 8DC2EF4F0486A6940098B216 /* WebKit2 */,
+ 8DC2EF4F0486A6940098B216 /* WebKit */,
+ 1A6280CF191997BD006AD9F9 /* WebKit2 */,
1A50DB1D110A3BDC000D3FE5 /* WebProcess */,
BCDE093313272496001259FB /* PluginProcess */,
51FA1E17180CCADE00C44BE9 /* DatabaseProcess */,
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
+ 1A07D2F51919AA8A00ECDA16 /* Make Frameworks Symbolic Link */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ WebKit2.xcodeproj,
+ );
+ name = "Make Frameworks Symbolic Link";
+ outputPaths = (
+ "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+ };
+ 1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\nmkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\nfi\nif [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\necho \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\nexit 1\nfi\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
+ };
+ 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Migrate WebKitLegacy Headers";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\nmake -C mac -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+ };
+ 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Migrate Headers to WebKit2";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n make -C mac -f \"MigrateHeadersToWebKit2.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+ };
+ 1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+ );
+ name = "Update Info.plist with version information";
+ outputPaths = (
+ "$(PROJECT_DIR)/Info.plist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/Info.plist\";\nfi;\n";
+ };
+ 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+ );
+ name = "Update Info.plist with version information";
+ outputPaths = (
+ "${PROJECT_DIR}/mac/WebKit2.plist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/Info-WebKit2.plist\";\nfi;\n";
+ };
3713F0231429063D0036387F /* Check For Inappropriate Objective-C Class Names */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
+ shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
};
5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {
isa = PBXShellScriptBuildPhase;
);
name = "Add XPCServices symlink";
outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit2.framework/XPCServices",
+ "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit.framework/XPCServices",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n ln -sf Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\nfi\n";
+ shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n ln -sf Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nfi\n";
};
BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
isa = PBXShellScriptBuildPhase;
);
name = "Copy XPC services for engineering builds";
outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.OfflineStorage.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Databases.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.OfflineStorage.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} == iphone* ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} == iphone* ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
};
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 1A6280CB191997BD006AD9F9 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 1A6280F019199800006AD9F9 /* WebKit2.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
1AC25FAD12A48EA700BD2671 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
37FC194A18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm in Sources */,
516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
+ 1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
/* Begin PBXTargetDependency section */
1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
targetProxy = 1A50DB26110A3BEF000D3FE5 /* PBXContainerItemProxy */;
};
1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */ = {
target = 1A50DB1D110A3BDC000D3FE5 /* WebProcess */;
targetProxy = 1A50DB3B110A3C19000D3FE5 /* PBXContainerItemProxy */;
};
+ 1A6280EC191997D3006AD9F9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
+ targetProxy = 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */;
+ };
+ 1A6280F619199865006AD9F9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 1A6280CF191997BD006AD9F9 /* WebKit2 */;
+ targetProxy = 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */;
+ };
37F7407912721F740093869B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
};
510CC8511613C98D00D03ED3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
targetProxy = 510CC8501613C98D00D03ED3 /* PBXContainerItemProxy */;
};
51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */ = {
};
51FA1E1A180CCADE00C44BE9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
targetProxy = 51FA1E1B180CCADE00C44BE9 /* PBXContainerItemProxy */;
};
BC77F95616D0459100F8F78A /* PBXTargetDependency */ = {
};
BCDE093613272496001259FB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
targetProxy = BCDE093713272496001259FB /* PBXContainerItemProxy */;
};
BCDE0AC113272712001259FB /* PBXTargetDependency */ = {
};
name = Release;
};
+ 1A6280E4191997BE006AD9F9 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ 1A6280E5191997BE006AD9F9 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ 1A6280E6191997BE006AD9F9 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+ buildSettings = {
+ };
+ name = Production;
+ };
1AC25FB112A48EA700BD2671 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
};
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+ baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
OTHER_LDFLAGS = (
};
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+ baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
OTHER_LDFLAGS = (
};
5D22D69D11A7534600BF30E5 /* Production */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+ baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
+ 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 1A6280E4191997BE006AD9F9 /* Debug */,
+ 1A6280E5191997BE006AD9F9 /* Release */,
+ 1A6280E6191997BE006AD9F9 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */ = {
isa = XCConfigurationList;
buildConfigurations = (
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
+ 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB91AE08733DA50010E9CD /* Debug */,
<key>EnvironmentVariables</key>
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
</dict>
</dict>
</dict>
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
-#import <WebKit2/WKWebProcessPlugInBrowserContextController.h>
-#import <WebKit2/WKWebProcessPlugInFrame.h>
-#import <WebKit2/WKWebProcessPlugInNodeHandle.h>
+#import <WebKit/WKWebProcessPlugInBrowserContextController.h>
+#import <WebKit/WKWebProcessPlugInFrame.h>
+#import <WebKit/WKWebProcessPlugInNodeHandle.h>
@protocol WKWebProcessPlugInFormDelegatePrivate <NSObject>
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKRenderingProgressEvents.h>
+#import <WebKit/WKRenderingProgressEvents.h>
@class WKWebProcessPlugInBrowsingContextController;
@class WKWebProcessPlugInFrame;
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
#if WK_API_ENABLED
#define WKBundle_h
#include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKBundleBackForwardList_h
#define WKBundleBackForwardList_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKBundleBackForwardListItem_h
#define WKBundleBackForwardListItem_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#ifndef WKBundleDOMWindowExtension_h
#define WKBundleDOMWindowExtension_h
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
#ifdef __cplusplus
extern "C" {
#define WKBundleFrame_h
#include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKGeometry.h>
#ifdef __cplusplus
extern "C" {
#define WKBundleFramePrivate_h
#include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
#ifndef __cplusplus
#include <stdbool.h>
git://git.webkit.org / WebKit-https.git / commitdiff