Changeset 160584 in webkit


Ignore:
Timestamp:
Dec 13, 2013 8:42:21 PM (10 years ago)
Author:
benjamin@webkit.org
Message:

[WK2] Fix the build and enable the NetworkProcess by default on iOS
​https://bugs.webkit.org/show_bug.cgi?id=125723

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-12-13
Reviewed by Sam Weinig.

  • Configurations/WebKit2.xcconfig:

Fix the list of excluded file to get the processes building.

  • NetworkProcess/ios/NetworkProcessIOS.mm:

(WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHosAt):
Update PlatformCertificateInfo->CertificateInfo match the new name after r159647.

  • UIProcess/API/Cocoa/WKProcessGroup.mm:

(-[WKProcessGroup initWithInjectedBundleURL:]):
Enable the NetworkProcess by default.

  • UIProcess/Network/mac/NetworkProcessProxyMac.mm:

(WebKit::shouldUseXPC):
Use the right macro.

  • WebKit2Prefix.h:

Eanble the flags NETWORK_PROCESS and CUSTOM_PROTOCOLS.

Location:
trunk/Source/WebKit2
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160583 r160584  
     12013-12-13  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        [WK2] Fix the build and enable the NetworkProcess by default on iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=125723
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/WebKit2.xcconfig:
     9        Fix the list of excluded file to get the processes building.
     10
     11        * NetworkProcess/ios/NetworkProcessIOS.mm:
     12        (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHosAt):
     13        Update PlatformCertificateInfo->CertificateInfo match the new name after r159647.
     14
     15        * UIProcess/API/Cocoa/WKProcessGroup.mm:
     16        (-[WKProcessGroup initWithInjectedBundleURL:]):
     17        Enable the NetworkProcess by default.
     18
     19        * UIProcess/Network/mac/NetworkProcessProxyMac.mm:
     20        (WebKit::shouldUseXPC):
     21        Use the right macro.
     22
     23        * WebKit2Prefix.h:
     24        Eanble the flags NETWORK_PROCESS and CUSTOM_PROTOCOLS.
     25
    1262013-12-13  Dan Bernstein  <mitz@apple.com>
    227

  • trunk/Source/WebKit2/Configurations/WebKit2.xcconfig

    r160117 r160584  
    3939
    4040EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    41 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf;
     41EXCLUDED_SOURCE_FILE_NAMES_iphoneos = BuiltInPDFView.mm DownloadMac.mm FindIndicatorWindow.mm NetworkProcessMac.mm PDFViewController.mm PageBannerMac.mm PageClientImpl.mm PasteboardTypes.mm PluginInfoStoreMac.mm PrintInfoMac.mm SecItemShimMethods.mm TextCheckerMac.mm WKAccessibilityWebPageObject.mm WKFullKeyboardAccessWatcher.mm WKInspector.cpp WKPrintingView.mm UIProcess/API/mac/WKView.mm WKBundlePageBannerMac.mm WebContextMenuProxyMac.mm WebEditorClientMac.mm WebInspectorProxyMac.mm WebPageMac.mm WebPageProxyMac.mm WebPlatformTouchPoint.cpp WebProcessMac.mm WebProcessProxyMac.mm WebTouchEvent.cpp *.pdf com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb;
    4242EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    4343

  • trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm

    r159724 r160584  
    5858}
    5959
    60 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String&)
     60void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String&)
    6161{
    6262    notImplemented();

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm

    r160191 r160584  
    201201    setUpInectedBundleClient(self, toAPI(_context.get()));
    202202    setUpHistoryClient(self, toAPI(_context.get()));
     203#if PLATFORM(IOS)
     204    _context->setUsesNetworkProcess(true);
     205#endif
    203206
    204207    return self;

  • trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm

    r159724 r160584  
    4848        return [value boolValue];
    4949
    50 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     50#if USE(XPC_SERVICES)
    5151    return true;
    5252#else

  • trunk/Source/WebKit2/WebKit2Prefix.h

    r159724 r160584  
    3535#if !PLATFORM(IOS)
    3636#define ENABLE_WEB_PROCESS_SANDBOX 1
     37#endif
     38
    3739#define ENABLE_NETWORK_PROCESS 1
    38 #endif
    3940
    4041#define ENABLE_DATABASE_PROCESS 1
    … …  
    4243#define ENABLE_MEMORY_SAMPLER 1
    4344
    44 #if !PLATFORM(IOS)
    4545#define ENABLE_CUSTOM_PROTOCOLS 1
    46 #endif
    4746
    4847#define ENABLE_SHAREABLE_RESOURCE 1
Note: See TracChangeset for help on using the changeset viewer.