Changeset 192910 in webkit


Ignore:
Timestamp:
Dec 1, 2015, 1:57:17 PM (10 years ago)
Author:
andersca@apple.com
Message:

Remove WebKit2.framework
​https://bugs.webkit.org/show_bug.cgi?id=151715

Reviewed by Dan Bernstein.

Source/WebKit2:

  • Configurations/WebKit2.xcconfig: Removed.
  • UIProcess/API/Cocoa/WebKit2.h: Removed.
  • WebKit2.xcodeproj/project.pbxproj:
  • mac/Info-WebKit2.plist: Removed.
  • mac/MigrateHeadersToWebKit2.make: Removed.
  • mac/WebKit2.m: Removed.

Tools:

  • TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp:
  • TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
  • TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h:
Location:
trunk
Files:
5 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r192900 r192910  
     12015-12-01  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove WebKit2.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=151715
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Configurations/WebKit2.xcconfig: Removed.
     9        * UIProcess/API/Cocoa/WebKit2.h: Removed.
     10        * WebKit2.xcodeproj/project.pbxproj:
     11        * mac/Info-WebKit2.plist: Removed.
     12        * mac/MigrateHeadersToWebKit2.make: Removed.
     13        * mac/WebKit2.m: Removed.
     14
    1152015-12-01  Alex Christensen  <achristensen@webkit.org>
    216

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r192808 r192910  
    1717                        );
    1818                        dependencies = (
    19                                 1A6280F619199865006AD9F9 /* PBXTargetDependency */,
    2019                                1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */,
    2120                                51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */,
    … …  
    215214                1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */; };
    216215                1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */; };
    217                 1A3A73CE1A48C6D4007231B3 /* APIPageGroupHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */; };
    218216                1A3A73CF1A48C7F1007231B3 /* APIPageGroupHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */; };
    219217                1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
    … …  
    282280                1A6280C51919949F006AD9F9 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C41919949F006AD9F9 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
    283281                1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    284                 1A6280F019199800006AD9F9 /* WebKit2.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280EE19199800006AD9F9 /* WebKit2.m */; };
    285282                1A6280F31919982A006AD9F9 /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280F21919982A006AD9F9 /* WebKit.m */; };
    286283                1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
    … …  
    307304                1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */; };
    308305                1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */; };
    309                 1A7284471959ED100007BCE5 /* SessionStateConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7284451959ED100007BCE5 /* SessionStateConversion.h */; };
    310306                1A7284481959F8040007BCE5 /* SessionStateConversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7284441959ED100007BCE5 /* SessionStateConversion.cpp */; };
    311307                1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */; };
    … …  
    470466                1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */; };
    471467                1AD8790A18B6C38A006CAFD7 /* WKUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
    472                 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
    473468                1ADCB86A189831B30022EE5A /* NavigationActionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADCB868189831B30022EE5A /* NavigationActionData.cpp */; };
    474469                1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADCB869189831B30022EE5A /* NavigationActionData.h */; };
    … …  
    506501                1AF4592E19464B2000F9D4A2 /* WKError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4592C19464B2000F9D4A2 /* WKError.mm */; };
    507502                1AF4592F19464B2000F9D4A2 /* WKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4592D19464B2000F9D4A2 /* WKError.h */; settings = {ATTRIBUTES = (Public, ); }; };
    508                 1AF459321946559500F9D4A2 /* WKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF459301946540700F9D4A2 /* WKError.h */; settings = {ATTRIBUTES = (Private, ); }; };
    509503                1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */; };
    510504                1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */; };
    … …  
    11141108                7C4ABED41AA8FCB80088AA37 /* WebCompiledContentExtensionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4ABED21AA8FCB80088AA37 /* WebCompiledContentExtensionData.cpp */; };
    11151109                7C4ABED51AA8FCB80088AA37 /* WebCompiledContentExtensionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ABED31AA8FCB80088AA37 /* WebCompiledContentExtensionData.h */; };
    1116                 7C4ED3291A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ED3271A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h */; };
    11171110                7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */; };
    11181111                7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */; };
    … …  
    14601453                BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */; };
    14611454                BC575613126E0138006F0F12 /* APIError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* APIError.cpp */; };
    1462                 BC59548915C7868500FD1E3E /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59548815C7868500FD1E3E /* WebKit2.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14631455                BC5C75C814954DA600BC4775 /* WKConnectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */; };
    14641456                BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
    … …  
    17861778                E19582D6153CC05400B60875 /* PDFKitImports.mm in Sources */ = {isa = PBXBuildFile; fileRef = E19582D4153CC05300B60875 /* PDFKitImports.mm */; };
    17871779                E19BDA86193665E300B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */; };
    1788                 E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E19BDA88193686A400B97F57 /* SandboxUtilities.h */; };
    17891780                E19BDA8B19368D4600B97F57 /* SandboxUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = E19BDA87193686A400B97F57 /* SandboxUtilities.mm */; };
    17901781                E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A31731134CEA6C007C9A4F /* AttributedString.h */; };
    … …  
    18681859                        remoteGlobalIDString = 1A50DB1D110A3BDC000D3FE5;
    18691860                        remoteInfo = WebProcess;
    1870                 };
    1871                 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */ = {
    1872                         isa = PBXContainerItemProxy;
    1873                         containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
    1874                         proxyType = 1;
    1875                         remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
    1876                         remoteInfo = WebKit;
    1877                 };
    1878                 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */ = {
    1879                         isa = PBXContainerItemProxy;
    1880                         containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
    1881                         proxyType = 1;
    1882                         remoteGlobalIDString = 1A6280CF191997BD006AD9F9;
    1883                         remoteInfo = WebKit2;
    18841861                };
    18851862                375E0626191EA8CC004E3CAF /* PBXContainerItemProxy */ = {
    … …  
    24062383                1A4F976E100E7B6600637A18 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
    24072384                1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
    2408                 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
    24092385                1A52C0F51A38CDC70016160A /* WebStorageNamespaceProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebStorageNamespaceProvider.cpp; sourceTree = "<group>"; };
    24102386                1A52C0F61A38CDC70016160A /* WebStorageNamespaceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebStorageNamespaceProvider.h; sourceTree = "<group>"; };
    … …  
    24302406                1A6280C41919949F006AD9F9 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
    24312407                1A6280C61919950C006AD9F9 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
    2432                 1A6280D0191997BD006AD9F9 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    2433                 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-WebKit2.plist"; sourceTree = "<group>"; };
    2434                 1A6280EE19199800006AD9F9 /* WebKit2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit2.m; sourceTree = "<group>"; };
    24352408                1A6280F21919982A006AD9F9 /* WebKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
    24362409                1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableBitmap.cpp; sourceTree = "<group>"; };
    … …  
    26452618                1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesInternal.h; sourceTree = "<group>"; };
    26462619                1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUIDelegate.h; sourceTree = "<group>"; };
    2647                 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */ = {isa = PBXFileReference; lastKnownFileType = text; path = MigrateHeadersToWebKit2.make; sourceTree = "<group>"; };
    26482620                1ADAE12D1919A5B400F48E21 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
    26492621                1ADCB868189831B30022EE5A /* NavigationActionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationActionData.cpp; sourceTree = "<group>"; };
    … …  
    37313703                BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuProxyMac.mm; sourceTree = "<group>"; };
    37323704                BC575612126E0138006F0F12 /* APIError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIError.cpp; sourceTree = "<group>"; };
    3733                 BC59548815C7868500FD1E3E /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
    37343705                BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnectionInternal.h; sourceTree = "<group>"; };
    37353706                BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMain.mm; sourceTree = "<group>"; };
    … …  
    41504121
    41514122/* Begin PBXFrameworksBuildPhase section */
    4152                 1A6280CC191997BD006AD9F9 /* Frameworks */ = {
    4153                         isa = PBXFrameworksBuildPhase;
    4154                         buildActionMask = 2147483647;
    4155                         files = (
    4156                         );
    4157                         runOnlyForDeploymentPostprocessing = 0;
    4158                 };
    41594123                1AC25FAE12A48EA700BD2671 /* Frameworks */ = {
    41604124                        isa = PBXFrameworksBuildPhase;
    … …  
    43294293                                510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
    43304294                                8DC2EF5B0486A6940098B216 /* WebKit.framework */,
    4331                                 1A6280D0191997BD006AD9F9 /* WebKit2.framework */,
    43324295                                1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */,
    43334296                                CDC3830617211799008A2FC3 /* WebProcessShim.dylib */,
    … …  
    45034466                                1A4A93B61AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h */,
    45044467                                1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */,
    4505                                 BC59548815C7868500FD1E3E /* WebKit2.h */,
    45064468                                BCBAAC6C144E61910053F82F /* WKBrowsingContextController.h */,
    45074469                                BCBAAC6D144E61920053F82F /* WKBrowsingContextController.mm */,
    … …  
    46124574                                BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
    46134575                                BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
    4614                                 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */,
    46154576                                A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
    46164577                        );
    … …  
    46354596                        isa = PBXGroup;
    46364597                        children = (
    4637                                 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */,
    4638                                 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */,
    4639                                 1A6280EE19199800006AD9F9 /* WebKit2.m */,
    46404598                                1AF459301946540700F9D4A2 /* WKError.h */,
    46414599                                1ADAE12D1919A5B400F48E21 /* WKPreferences.h */,
    … …  
    76237581
    76247582/* Begin PBXHeadersBuildPhase section */
    7625                 1A6280CD191997BD006AD9F9 /* Headers */ = {
    7626                         isa = PBXHeadersBuildPhase;
    7627                         buildActionMask = 2147483647;
    7628                         files = (
    7629                                 1A3A73CE1A48C6D4007231B3 /* APIPageGroupHandle.h in Headers */,
    7630                                 7C4ED3291A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h in Headers */,
    7631                                 E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */,
    7632                                 1A7284471959ED100007BCE5 /* SessionStateConversion.h in Headers */,
    7633                                 1AF459321946559500F9D4A2 /* WKError.h in Headers */,
    7634                                 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
    7635                         );
    7636                         runOnlyForDeploymentPostprocessing = 0;
    7637                 };
    76387583                1AC25FAC12A48EA700BD2671 /* Headers */ = {
    76397584                        isa = PBXHeadersBuildPhase;
    … …  
    81608105                                2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */,
    81618106                                1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
    8162                                 BC59548915C7868500FD1E3E /* WebKit2.h in Headers */,
    81638107                                BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
    81648108                                BC9BA5051697C45300E44616 /* WebKit2Initialize.h in Headers */,
    … …  
    85978541                        productType = "com.apple.product-type.application";
    85988542                };
    8599                 1A6280CF191997BD006AD9F9 /* WebKit2 */ = {
    8600                         isa = PBXNativeTarget;
    8601                         buildConfigurationList = 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */;
    8602                         buildPhases = (
    8603                                 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
    8604                                 1A6280CB191997BD006AD9F9 /* Sources */,
    8605                                 1A6280CC191997BD006AD9F9 /* Frameworks */,
    8606                                 1A6280CD191997BD006AD9F9 /* Headers */,
    8607                                 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */,
    8608                         );
    8609                         buildRules = (
    8610                         );
    8611                         dependencies = (
    8612                                 1A6280EC191997D3006AD9F9 /* PBXTargetDependency */,
    8613                         );
    8614                         name = WebKit2;
    8615                         productName = WebKit2;
    8616                         productReference = 1A6280D0191997BD006AD9F9 /* WebKit2.framework */;
    8617                         productType = "com.apple.product-type.framework";
    8618                 };
    86198543                1AC25FAF12A48EA700BD2671 /* PluginProcessShim */ = {
    86208544                        isa = PBXNativeTarget;
    … …  
    89708894                                1A50DB38110A3C13000D3FE5 /* All */,
    89718895                                8DC2EF4F0486A6940098B216 /* WebKit */,
    8972                                 1A6280CF191997BD006AD9F9 /* WebKit2 */,
    89738896                                1A50DB1D110A3BDC000D3FE5 /* WebProcess */,
    89748897                                BCDE093313272496001259FB /* PluginProcess */,
    … …  
    91849107                        shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n    UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n    UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o ${WKFOUNDATION_H}.unifdef ${WKFOUNDATION_H}\n\ncase $? in\n0)\n    rm ${WKFOUNDATION_H}.unifdef\n    ;;\n1)\n    mv ${WKFOUNDATION_H}{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
    91859108                };
    9186                 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
    9187                         isa = PBXShellScriptBuildPhase;
    9188                         buildActionMask = 2147483647;
    9189                         files = (
    9190                         );
    9191                         inputPaths = (
    9192                         );
    9193                         name = "Migrate Headers to WebKit2";
    9194                         outputPaths = (
    9195                         );
    9196                         runOnlyForDeploymentPostprocessing = 0;
    9197                         shellPath = /bin/sh;
    9198                         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";
    9199                 };
    92009109                1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */ = {
    92019110                        isa = PBXShellScriptBuildPhase;
    … …  
    92139122                        shellPath = /bin/sh;
    92149123                        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";
    9215                 };
    9216                 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */ = {
    9217                         isa = PBXShellScriptBuildPhase;
    9218                         buildActionMask = 2147483647;
    9219                         files = (
    9220                         );
    9221                         inputPaths = (
    9222                                 "$(PROJECT_DIR)/Configurations/Version.xcconfig",
    9223                         );
    9224                         name = "Update Info.plist with version information";
    9225                         outputPaths = (
    9226                                 "${PROJECT_DIR}/mac/WebKit2.plist",
    9227                         );
    9228                         runOnlyForDeploymentPostprocessing = 0;
    9229                         shellPath = /bin/sh;
    9230                         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";
    92319124                };
    92329125                3713F0231429063D0036387F /* Check For Inappropriate Objective-C Class Names */ = {
    … …  
    94599352                        files = (
    94609353                                BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */,
    9461                         );
    9462                         runOnlyForDeploymentPostprocessing = 0;
    9463                 };
    9464                 1A6280CB191997BD006AD9F9 /* Sources */ = {
    9465                         isa = PBXSourcesBuildPhase;
    9466                         buildActionMask = 2147483647;
    9467                         files = (
    9468                                 1A6280F019199800006AD9F9 /* WebKit2.m in Sources */,
    94699354                        );
    94709355                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1041910304                        targetProxy = 1A50DB3B110A3C19000D3FE5 /* PBXContainerItemProxy */;
    1042010305                };
    10421                 1A6280EC191997D3006AD9F9 /* PBXTargetDependency */ = {
    10422                         isa = PBXTargetDependency;
    10423                         target = 8DC2EF4F0486A6940098B216 /* WebKit */;
    10424                         targetProxy = 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */;
    10425                 };
    10426                 1A6280F619199865006AD9F9 /* PBXTargetDependency */ = {
    10427                         isa = PBXTargetDependency;
    10428                         target = 1A6280CF191997BD006AD9F9 /* WebKit2 */;
    10429                         targetProxy = 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */;
    10430                 };
    1043110306                375E0627191EA8CC004E3CAF /* PBXTargetDependency */ = {
    1043210307                        isa = PBXTargetDependency;
    … …  
    1062210497                        };
    1062310498                        name = Release;
    10624                 };
    10625                 1A6280E4191997BE006AD9F9 /* Debug */ = {
    10626                         isa = XCBuildConfiguration;
    10627                         baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
    10628                         buildSettings = {
    10629                         };
    10630                         name = Debug;
    10631                 };
    10632                 1A6280E5191997BE006AD9F9 /* Release */ = {
    10633                         isa = XCBuildConfiguration;
    10634                         baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
    10635                         buildSettings = {
    10636                         };
    10637                         name = Release;
    10638                 };
    10639                 1A6280E6191997BE006AD9F9 /* Production */ = {
    10640                         isa = XCBuildConfiguration;
    10641                         baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
    10642                         buildSettings = {
    10643                         };
    10644                         name = Production;
    1064510499                };
    1064610500                1AC25FB112A48EA700BD2671 /* Debug */ = {
    … …  
    1114811002                        defaultConfigurationName = Production;
    1114911003                };
    11150                 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
    11151                         isa = XCConfigurationList;
    11152                         buildConfigurations = (
    11153                                 1A6280E4191997BE006AD9F9 /* Debug */,
    11154                                 1A6280E5191997BE006AD9F9 /* Release */,
    11155                                 1A6280E6191997BE006AD9F9 /* Production */,
    11156                         );
    11157                         defaultConfigurationIsVisible = 0;
    11158                         defaultConfigurationName = Production;
    11159                 };
    1116011004                1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */ = {
    1116111005                        isa = XCConfigurationList;

  • trunk/Tools/ChangeLog

    r192909 r192910  
     12015-12-01  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove WebKit2.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=151715
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp:
     9        * TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp:
     10        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
     11        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
     12        * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
     13        * TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
     14        * TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h:
     15
    1162015-12-01  Joseph Pecoraro  <pecoraro@apple.com>
    217

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp

    r177506 r192910  
    3131#include "PlatformWebView.h"
    3232#include "Test.h"
    33 #include <WebKit2/WKRetainPtr.h>
     33#include <WebKit/WKRetainPtr.h>
    3434
    3535namespace TestWebKitAPI {

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp

    r177506 r192910  
    3030#include "InjectedBundleTest.h"
    3131#include "PlatformUtilities.h"
    32 #include <WebKit2/WKBundle.h>
    33 #include <WebKit2/WKBundleFramePrivate.h>
    34 #include <WebKit2/WKBundlePage.h>
    35 #include <WebKit2/WKBundlePagePrivate.h>
     32#include <WebKit/WKBundle.h>
     33#include <WebKit/WKBundleFramePrivate.h>
     34#include <WebKit/WKBundlePage.h>
     35#include <WebKit/WKBundlePagePrivate.h>
    3636
    3737namespace TestWebKitAPI {

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm

    r188892 r192910  
    3131#import "PlatformWebView.h"
    3232#import "TestBrowsingContextLoadDelegate.h"
    33 #import <WebKit/WebKit2.h>
    3433#import <wtf/RetainPtr.h>
    3534

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm

    r188892 r192910  
    3333#import "TestBrowsingContextLoadDelegate.h"
    3434#import "TestProtocol.h"
    35 #import <WebKit/WebKit2.h>
    3635#import <wtf/RetainPtr.h>
    3736

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm

    r188892 r192910  
    3434#import "TestBrowsingContextLoadDelegate.h"
    3535#import "TestProtocol.h"
    36 #import <WebKit/WebKit2.h>
    3736#import <WebKit/WKViewPrivate.h>
    3837

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm

    r188892 r192910  
    3636#import <WebKit/WKSerializedScriptValue.h>
    3737#import <WebKit/WKViewPrivate.h>
    38 #import <WebKit/WebKit2.h>
    3938
    4039#if WK_API_ENABLED && PLATFORM(MAC)

  • trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h

    r188892 r192910  
    2424 */
    2525
    26 #import <WebKit/WebKit2.h>
     26#import <WebKit/WKBrowsingContextController.h>
     27#import <WebKit/WKBrowsingContextLoadDelegate.h>
    2728
    2829#if WK_API_ENABLED && PLATFORM(MAC)
Note: See TracChangeset for help on using the changeset viewer.