⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 219960 in webkit


Ignore:
Timestamp:
Jul 26, 2017, 1:11:38 PM (9 years ago)
Author:
beidson@apple.com
Message:

Remove DATABASE_PROCESS build flag.
​https://bugs.webkit.org/show_bug.cgi?id=174868

Reviewed by Andy Estes.

.:

  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsMac.cmake:
  • Source/cmake/OptionsWPE.cmake:
  • Source/cmake/WebKitFeatures.cmake:

Source/WebKit:

  • CMakeLists.txt:
  • DatabaseProcess/DatabaseProcess.cpp:
  • DatabaseProcess/DatabaseProcess.h:
  • DatabaseProcess/DatabaseProcess.messages.in:
  • DatabaseProcess/DatabaseToWebProcessConnection.cpp:
  • DatabaseProcess/DatabaseToWebProcessConnection.h:
  • DatabaseProcess/DatabaseToWebProcessConnection.messages.in:
  • DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
  • DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp:
  • DatabaseProcess/ios/DatabaseProcessIOS.mm:
  • DatabaseProcess/mac/DatabaseProcessMac.mm:
  • DatabaseProcess/unix/DatabaseProcessMainUnix.h:
  • Shared/Databases/DatabaseProcessCreationParameters.cpp:
  • Shared/Databases/DatabaseProcessCreationParameters.h:
  • Shared/ProcessExecutablePath.h:
  • Shared/gtk/ProcessExecutablePathGtk.cpp:

(WebKit::executablePathOfDatabaseProcess):

  • Shared/wpe/ProcessExecutablePathWPE.cpp:

(WebKit::executablePathOfDatabaseProcess):

  • UIProcess/ChildProcessProxy.cpp:

(WebKit::ChildProcessProxy::getLaunchOptions):

  • UIProcess/Databases/DatabaseProcessProxy.cpp:
  • UIProcess/Databases/DatabaseProcessProxy.h:
  • UIProcess/Databases/DatabaseProcessProxy.messages.in:
  • UIProcess/Launcher/ProcessLauncher.h:
  • UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::serviceName):

  • UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs):

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::databaseProcessCrashed):
(WebKit::WebProcessPool::databaseProcessIdentifier):
(WebKit::WebProcessPool::terminateDatabaseProcess):

  • UIProcess/WebProcessPool.h:

(WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::getDatabaseProcessConnection):

  • UIProcess/WebProcessProxy.h:
  • UIProcess/WebProcessProxy.messages.in:
  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::fetchDataAndApply):
(WebKit::WebsiteDataStore::removeData):

  • WebKit2Prefix.h:
  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in:
  • WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
  • WebProcess/Databases/WebToDatabaseProcessConnection.h:
  • WebProcess/WebProcess.cpp:
  • WebProcess/WebProcess.h:
Location:
trunk
Files:
44 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r219954 r219960  
     12017-07-26  Brady Eidson  <beidson@apple.com>
     2
     3        Remove DATABASE_PROCESS build flag.
     4        https://bugs.webkit.org/show_bug.cgi?id=174868
     5
     6        Reviewed by Andy Estes.
     7
     8        * Source/cmake/OptionsGTK.cmake:
     9        * Source/cmake/OptionsMac.cmake:
     10        * Source/cmake/OptionsWPE.cmake:
     11        * Source/cmake/WebKitFeatures.cmake:
     12
    1132017-07-26  Brian Burg  <bburg@apple.com>
    214

  • trunk/Source/WebKit/CMakeLists.txt

    r219874 r219960  
    876876endif ()
    877877
    878 if (ENABLE_DATABASE_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
    879     add_definitions(-DENABLE_DATABASE_PROCESS=1)
    880     add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
    881     add_webkit2_prefix_header(DatabaseProcess)
    882     target_link_libraries(DatabaseProcess ${DatabaseProcess_LIBRARIES})
    883     install(TARGETS DatabaseProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
    884 
    885     if (WebKit2_DatabaseProcess_OUTPUT_NAME)
    886         set_target_properties(DatabaseProcess PROPERTIES OUTPUT_NAME ${WebKit2_DatabaseProcess_OUTPUT_NAME})
    887     endif ()
    888 endif ()
    889 
    890878if ("${PORT}" STREQUAL "Mac")
    891879    set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)

  • trunk/Source/WebKit/ChangeLog

    r219958 r219960  
     12017-07-26  Brady Eidson  <beidson@apple.com>
     2
     3        Remove DATABASE_PROCESS build flag.
     4        https://bugs.webkit.org/show_bug.cgi?id=174868
     5
     6        Reviewed by Andy Estes.
     7
     8        * CMakeLists.txt:
     9        * DatabaseProcess/DatabaseProcess.cpp:
     10        * DatabaseProcess/DatabaseProcess.h:
     11        * DatabaseProcess/DatabaseProcess.messages.in:
     12        * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
     13        * DatabaseProcess/DatabaseToWebProcessConnection.h:
     14        * DatabaseProcess/DatabaseToWebProcessConnection.messages.in:
     15        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
     16        * DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp:
     17        * DatabaseProcess/ios/DatabaseProcessIOS.mm:
     18        * DatabaseProcess/mac/DatabaseProcessMac.mm:
     19        * DatabaseProcess/unix/DatabaseProcessMainUnix.h:
     20        * Shared/Databases/DatabaseProcessCreationParameters.cpp:
     21        * Shared/Databases/DatabaseProcessCreationParameters.h:
     22        * Shared/ProcessExecutablePath.h:
     23        * Shared/gtk/ProcessExecutablePathGtk.cpp:
     24        (WebKit::executablePathOfDatabaseProcess):
     25        * Shared/wpe/ProcessExecutablePathWPE.cpp:
     26        (WebKit::executablePathOfDatabaseProcess):
     27        * UIProcess/ChildProcessProxy.cpp:
     28        (WebKit::ChildProcessProxy::getLaunchOptions):
     29        * UIProcess/Databases/DatabaseProcessProxy.cpp:
     30        * UIProcess/Databases/DatabaseProcessProxy.h:
     31        * UIProcess/Databases/DatabaseProcessProxy.messages.in:
     32        * UIProcess/Launcher/ProcessLauncher.h:
     33        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
     34        (WebKit::ProcessLauncher::launchProcess):
     35        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
     36        (WebKit::serviceName):
     37        * UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:
     38        (WebKit::ProcessLauncher::launchProcess):
     39        * UIProcess/Network/NetworkProcessProxy.cpp:
     40        (WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs):
     41        * UIProcess/WebProcessPool.cpp:
     42        (WebKit::WebProcessPool::databaseProcessCrashed):
     43        (WebKit::WebProcessPool::databaseProcessIdentifier):
     44        (WebKit::WebProcessPool::terminateDatabaseProcess):
     45        * UIProcess/WebProcessPool.h:
     46        (WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary):
     47        * UIProcess/WebProcessProxy.cpp:
     48        (WebKit::WebProcessProxy::getDatabaseProcessConnection):
     49        * UIProcess/WebProcessProxy.h:
     50        * UIProcess/WebProcessProxy.messages.in:
     51        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     52        (WebKit::WebsiteDataStore::fetchDataAndApply):
     53        (WebKit::WebsiteDataStore::removeData):
     54        * WebKit2Prefix.h:
     55        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in:
     56        * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
     57        * WebProcess/Databases/WebToDatabaseProcessConnection.h:
     58        * WebProcess/WebProcess.cpp:
     59        * WebProcess/WebProcess.h:
     60
    1612017-07-26  Brady Eidson  <beidson@apple.com>
    262

  • trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.cpp

    r218457 r219960  
    2727#include "DatabaseProcess.h"
    2828
    29 #if ENABLE(DATABASE_PROCESS)
    30 
    3129#include "DatabaseProcessCreationParameters.h"
    3230#include "DatabaseProcessMessages.h"
    … …  
    325323
    326324} // namespace WebKit
    327 
    328 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.h

    r219595 r219960  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(DATABASE_PROCESS)
    2927
    3028#include "ChildProcess.h"
    … …  
    127125
    128126} // namespace WebKit
    129 
    130 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in

    r215961 r219960  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(DATABASE_PROCESS)
    24 
    2523messages -> DatabaseProcess LegacyReceiver {
    2624    # Initializes a WebsiteDataStore/Session in the DatabaseProcess with the correct parameters
    … …  
    3836#endif
    3937}
    40 
    41 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp

    r215961 r219960  
    3232#include "WebIDBConnectionToClientMessages.h"
    3333#include <wtf/RunLoop.h>
    34 
    35 #if ENABLE(DATABASE_PROCESS)
    3634
    3735namespace WebKit {
    … …  
    128126
    129127} // namespace WebKit
    130 
    131 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h

    r215961 r219960  
    2424 */
    2525
    26 #ifndef DatabaseToWebProcessConnection_h
    27 #define DatabaseToWebProcessConnection_h
     26#pragma once
    2827
    2928#include "Connection.h"
    … …  
    3231#include <WebCore/SessionID.h>
    3332#include <wtf/HashMap.h>
    34 
    35 #if ENABLE(DATABASE_PROCESS)
    3633
    3734namespace WebKit {
    … …  
    7370
    7471} // namespace WebKit
    75 
    76 #endif // ENABLE(DATABASE_PROCESS)
    77 #endif // DatabaseToWebProcessConnection_h

  • trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in

    r215961 r219960  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(DATABASE_PROCESS)
    24 
    2523messages -> DatabaseToWebProcessConnection LegacyReceiver {
    2624#if ENABLE(INDEXED_DATABASE)
    … …  
    3028#endif
    3129}
    32 
    33 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in

    r208609 r219960  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
     23#if ENABLE(INDEXED_DATABASE)
    2424
    2525messages -> WebIDBConnectionToClient {
    … …  
    5454    GetAllDatabaseNames(uint64_t serverConnectionIdentifier, struct WebCore::SecurityOriginData topOrigin, struct WebCore::SecurityOriginData openingOrigin, uint64_t callbackID);
    5555}
    56 #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
     56#endif // ENABLE(INDEXED_DATABASE)

  • trunk/Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp

    r209122 r219960  
    2727#include "DatabaseProcessMainUnix.h"
    2828
    29 #if ENABLE(DATABASE_PROCESS)
    30 
    3129#include "ChildProcessMain.h"
    3230#include "DatabaseProcess.h"
    … …  
    4038
    4139} // namespace WebKit
    42 
    43 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm

    r188892 r219960  
    2626#import "config.h"
    2727
    28 #if PLATFORM(IOS) && ENABLE(DATABASE_PROCESS)
     28#if PLATFORM(IOS)
    2929
    3030#import "DatabaseProcess.h"
    … …  
    6262} // namespace WebKit
    6363
    64 #endif // PLATFORM(IOS) && ENABLE(DATABASE_PROCESS)
     64#endif // PLATFORM(IOS)

  • trunk/Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm

    r167946 r219960  
    2626#import "config.h"
    2727
    28 #if PLATFORM(MAC) && ENABLE(DATABASE_PROCESS)
     28#if PLATFORM(MAC)
    2929
    3030#import "DatabaseProcess.h"
    … …  
    6262} // namespace WebKit
    6363
    64 #endif // PLATFORM(MAC) && ENABLE(DATABASE_PROCESS)
     64#endif // PLATFORM(MAC)

  • trunk/Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h

    r179007 r219960  
    2424 */
    2525
    26 #ifndef DatabaseProcessMainUnix_h
    27 #define DatabaseProcessMainUnix_h
    28 
    29 #if ENABLE(DATABASE_PROCESS)
     26#pragma once
    3027
    3128#include <WebKit/WKBase.h>
    … …  
    3835
    3936} // namespace WebKit
    40 
    41 #endif // ENABLE(DATABASE_PROCESS)
    42 
    43 #endif // DatabaseProcessMainUnix_h

  • trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp

    r215961 r219960  
    2626#include "config.h"
    2727#include "DatabaseProcessCreationParameters.h"
    28 
    29 #if ENABLE(DATABASE_PROCESS)
    3028
    3129#include "ArgumentCoders.h"
    … …  
    6159
    6260} // namespace WebKit
    63 
    64 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h

    r215961 r219960  
    3131#include <wtf/text/WTFString.h>
    3232
    33 #if ENABLE(DATABASE_PROCESS)
    34 
    3533namespace IPC {
    3634class Decoder;
    … …  
    5553
    5654} // namespace WebKit
    57 
    58 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/Shared/ProcessExecutablePath.h

    r192697 r219960  
    2626#include <wtf/text/WTFString.h>
    2727
    28 #ifndef ProcessExecutablePath_h
    29 #define ProcessExecutablePath_h
     28#pragma once
    3029
    3130namespace WebKit {
    … …  
    3433String executablePathOfPluginProcess();
    3534String executablePathOfNetworkProcess();
    36 #if ENABLE(DATABASE_PROCESS)
    3735String executablePathOfDatabaseProcess();
    38 #endif
     36
    3937}
    40 
    41 #endif

  • trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp

    r208278 r219960  
    8585}
    8686
    87 #if ENABLE(DATABASE_PROCESS)
    8887String executablePathOfDatabaseProcess()
    8988{
    9089    return findWebKitProcess("WebKitDatabaseProcess");
    9190}
    92 #endif
    9391
    9492} // namespace WebKit

  • trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp

    r216497 r219960  
    7878}
    7979
    80 #if ENABLE(DATABASE_PROCESS)
    8180String executablePathOfDatabaseProcess()
    8281{
    8382    return findWebKitProcess("WPEDatabaseProcess");
    8483}
    85 #endif
    8684
    8785} // namespace WebKit

  • trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp

    r219050 r219960  
    7171        varname = "NETWORK_PROCESS_CMD_PREFIX";
    7272        break;
    73 #if ENABLE(DATABASE_PROCESS)
    7473    case ProcessLauncher::ProcessType::Database:
    7574        varname = "DATABASE_PROCESS_CMD_PREFIX";
    7675        break;
    77 #endif
    7876    }
    7977    const char* processCmdPrefix = getenv(varname);

  • trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp

    r218457 r219960  
    3434#include <WebCore/NotImplemented.h>
    3535
    36 #if ENABLE(DATABASE_PROCESS)
    37 
    3836using namespace WebCore;
    3937
    … …  
    224222
    225223} // namespace WebKit
    226 
    227 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h

    r218457 r219960  
    2424 */
    2525
    26 #ifndef DatabaseProcessProxy_h
    27 #define DatabaseProcessProxy_h
    28 
    29 #if ENABLE(DATABASE_PROCESS)
     26#pragma once
    3027
    3128#include "ChildProcessProxy.h"
    … …  
    9592
    9693} // namespace WebKit
    97 
    98 #endif // ENABLE(DATABASE_PROCESS)
    99 
    100 #endif // DatabaseProcessProxy_h

  • trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in

    r204011 r219960  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(DATABASE_PROCESS)
    24 
    2523messages -> DatabaseProcessProxy LegacyReceiver {
    2624    DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
    … …  
    3432#endif
    3533}
    36 
    37 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h

    r216497 r219960  
    5252#endif
    5353        Network,
    54 #if ENABLE(DATABASE_PROCESS)
    5554        Database,
    56 #endif
    5755    };
    5856

  • trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

    r205474 r219960  
    8282        executablePath = executablePathOfNetworkProcess();
    8383        break;
    84 #if ENABLE(DATABASE_PROCESS)
    8584    case ProcessLauncher::ProcessType::Database:
    8685        executablePath = executablePathOfDatabaseProcess();
    8786        break;
    88 #endif
    8987    default:
    9088        ASSERT_NOT_REACHED();

  • trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

    r219191 r219960  
    5656    case ProcessLauncher::ProcessType::Network:
    5757        return "com.apple.WebKit.Networking";
    58 #if ENABLE(DATABASE_PROCESS)
    5958    case ProcessLauncher::ProcessType::Database:
    6059        return "com.apple.WebKit.Databases";
    61 #endif
    6260#if ENABLE(NETSCAPE_PLUGIN_API)
    6361    case ProcessLauncher::ProcessType::Plugin32:

  • trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp

    r216497 r219960  
    6868        executablePath = executablePathOfNetworkProcess();
    6969        break;
    70 #if ENABLE(DATABASE_PROCESS)
    7170    case ProcessLauncher::ProcessType::Database:
    7271        executablePath = executablePathOfDatabaseProcess();
    7372        break;
    74 #endif
    7573    default:
    7674        ASSERT_NOT_REACHED();

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r219754 r219960  
    292292void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
    293293{
    294 #if ENABLE(DATABASE_PROCESS)
    295294#if ENABLE(SANDBOX_EXTENSIONS)
    296295    SandboxExtension::HandleArray extensions;
    … …  
    304303#endif
    305304    connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
    306 #endif
    307305}
    308306

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r219713 r219960  
    3636#include "APIPageConfiguration.h"
    3737#include "APIProcessPoolConfiguration.h"
     38#include "DatabaseProcessCreationParameters.h"
     39#include "DatabaseProcessMessages.h"
    3840#include "DownloadProxy.h"
    3941#include "DownloadProxyMessages.h"
    … …  
    8486#include <wtf/text/StringBuilder.h>
    8587
    86 #if ENABLE(DATABASE_PROCESS)
    87 #include "DatabaseProcessCreationParameters.h"
    88 #include "DatabaseProcessMessages.h"
    89 #endif
    90 
    9188#if ENABLE(SERVICE_CONTROLS)
    9289#include "ServicesController.h"
    … …  
    518515}
    519516
    520 #if ENABLE(DATABASE_PROCESS)
    521517void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
    522518{
    … …  
    565561    m_databaseProcess = nullptr;
    566562}
    567 #endif
    568563
    569564void WebProcessPool::willStartUsingPrivateBrowsing()
    … …  
    10811076pid_t WebProcessPool::databaseProcessIdentifier()
    10821077{
    1083 #if ENABLE(DATABASE_PROCESS)
    10841078    if (!m_databaseProcess)
    10851079        return 0;
    10861080
    10871081    return m_databaseProcess->processIdentifier();
    1088 #else
    1089     return 0;
    1090 #endif
    10911082}
    10921083
    … …  
    13141305void WebProcessPool::terminateDatabaseProcess()
    13151306{
    1316 #if ENABLE(DATABASE_PROCESS)
    13171307    if (!m_databaseProcess)
    13181308        return;
    … …  
    13201310    m_databaseProcess->terminate();
    13211311    m_databaseProcess = nullptr;
    1322 #endif
    13231312}
    13241313

  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r219713 r219960  
    3030#include "APIProcessPoolConfiguration.h"
    3131#include "APIWebsiteDataStore.h"
     32#include "DatabaseProcessProxy.h"
    3233#include "DownloadProxyMap.h"
    3334#include "GenericCallback.h"
    … …  
    5455#include <wtf/text/WTFString.h>
    5556
    56 #if ENABLE(DATABASE_PROCESS)
    57 #include "DatabaseProcessProxy.h"
    58 #endif
    59 
    6057#if ENABLE(MEDIA_SESSION)
    6158#include "WebMediaSessionFocusManager.h"
    … …  
    316313    void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
    317314
    318 #if ENABLE(DATABASE_PROCESS)
    319315    void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
    320316    DatabaseProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
    321317    void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
    322318    void databaseProcessCrashed(DatabaseProcessProxy*);
    323 #endif
    324319
    325320#if PLATFORM(COCOA)
    … …  
    555550    bool m_didNetworkProcessCrash;
    556551    RefPtr<NetworkProcessProxy> m_networkProcess;
    557 
    558 #if ENABLE(DATABASE_PROCESS)
    559552    RefPtr<DatabaseProcessProxy> m_databaseProcess;
    560 #endif
    561    
     553
    562554    HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
    563555    HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
    … …  
    638630void WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary(T&& message)
    639631{
    640 #if ENABLE(DATABASE_PROCESS)
    641632    ensureDatabaseProcessAndWebsiteDataStore(nullptr);
    642633    m_databaseProcess->send(std::forward<T>(message), 0);
    643 #else
    644     sendToAllProcessesRelaunchingThemIfNecessary(std::forward<T>(message));
    645 #endif
    646634}
    647635

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

    r219904 r219960  
    574574}
    575575
    576 #if ENABLE(DATABASE_PROCESS)
    577576void WebProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
    578577{
    579578    m_processPool->getDatabaseProcessConnection(WTFMove(reply));
    580579}
    581 #endif // ENABLE(DATABASE_PROCESS)
    582580
    583581#if !PLATFORM(COCOA)

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.h

    r219713 r219960  
    215215#endif
    216216    void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
    217 #if ENABLE(DATABASE_PROCESS)
    218217    void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
    219 #endif
    220218
    221219    bool platformIsBeingDebugged() const;

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in

    r219713 r219960  
    3838#endif
    3939    GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
    40 #if ENABLE(DATABASE_PROCESS)
    4140    GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
    42 #endif
    4341    ProcessReadyToSuspend()
    4442    DidCancelProcessSuspension()

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r219904 r219960  
    432432    }
    433433
    434 #if ENABLE(DATABASE_PROCESS)
    435434    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
    436435        for (auto& processPool : processPools()) {
    … …  
    443442        }
    444443    }
    445 #endif
    446444
    447445    if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
    … …  
    728726    }
    729727
    730 #if ENABLE(DATABASE_PROCESS)
    731728    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
    732729        for (auto& processPool : processPools()) {
    … …  
    739736        }
    740737    }
    741 #endif
    742738
    743739    if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
    … …  
    10071003    }
    10081004
    1009 #if ENABLE(DATABASE_PROCESS)
    10101005    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
    10111006        for (auto& processPool : processPools()) {
    … …  
    10181013        }
    10191014    }
    1020 #endif
    10211015
    10221016    if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {

  • trunk/Source/WebKit/WebKit2Prefix.h

    r216497 r219960  
    3636
    3737#define ENABLE_WEB_PROCESS_SANDBOX 1
    38 
    39 #define ENABLE_DATABASE_PROCESS 1
    4038
    4139#define ENABLE_MEMORY_SAMPLER 1

  • trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in

    r208194 r219960  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
     23#if ENABLE(INDEXED_DATABASE)
    2424
    2525messages -> WebIDBConnectionToServer {
    … …  
    5151}
    5252
    53 #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
     53#endif // ENABLE(INDEXED_DATABASE)

  • trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp

    r215961 r219960  
    3131#include "WebIDBConnectionToServerMessages.h"
    3232#include "WebProcess.h"
    33 
    34 #if ENABLE(DATABASE_PROCESS)
    3533
    3634using namespace WebCore;
    … …  
    9492
    9593} // namespace WebKit
    96 
    97 #endif // ENABLE(DATABASE_PROCESS)

  • trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h

    r204985 r219960  
    2525 */
    2626
    27 #ifndef WebToDatabaseProcessConnection_h
    28 #define WebToDatabaseProcessConnection_h
     27#pragma once
    2928
    3029#include "Connection.h"
    … …  
    3332#include <WebCore/SessionID.h>
    3433#include <wtf/RefCounted.h>
    35 
    36 #if ENABLE(DATABASE_PROCESS)
    3734
    3835namespace WebCore {
    … …  
    7774
    7875} // namespace WebKit
    79 
    80 #endif // ENABLE(DATABASE_PROCESS)
    81 #endif // WebToDatabaseProcessConnection_h

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r219713 r219960  
    6565#include "WebResourceLoadStatisticsStoreMessages.h"
    6666#include "WebSocketStream.h"
     67#include "WebToDatabaseProcessConnection.h"
    6768#include "WebsiteData.h"
    6869#include "WebsiteDataType.h"
    … …  
    127128#endif
    128129
    129 #if ENABLE(DATABASE_PROCESS)
    130 #include "WebToDatabaseProcessConnection.h"
    131 #endif
    132 
    133130#if ENABLE(NOTIFICATIONS)
    134131#include "WebNotificationManager.h"
    … …  
    11401137}
    11411138
    1142 #if ENABLE(DATABASE_PROCESS)
    11431139void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
    11441140{
    … …  
    11791175    m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
    11801176}
    1181 
    1182 #endif // ENABLED(DATABASE_PROCESS)
    11831177
    11841178void WebProcess::setEnhancedAccessibility(bool flag)

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r219713 r219960  
    8787class WebPageGroupProxy;
    8888class WebProcessSupplement;
     89class WebToDatabaseProcessConnection;
    8990enum class WebsiteDataType;
    9091struct WebPageCreationParameters;
    … …  
    9596struct WebsiteDataStoreParameters;
    9697
    97 #if ENABLE(DATABASE_PROCESS)
    98 class WebToDatabaseProcessConnection;
    99 #endif
    100 
    10198class WebProcess : public ChildProcess {
    10299public:
    … …  
    168165#endif
    169166
    170 #if ENABLE(DATABASE_PROCESS)
    171167    void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
    172168    WebToDatabaseProcessConnection* webToDatabaseProcessConnection();
    173 #endif
    174169
    175170    void setCacheModel(uint32_t);
    … …  
    389384    std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
    390385
    391 #if ENABLE(DATABASE_PROCESS)
    392386    void ensureWebToDatabaseProcessConnection();
    393387    RefPtr<WebToDatabaseProcessConnection> m_webToDatabaseProcessConnection;
    394 #endif
    395388
    396389#if ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/cmake/OptionsGTK.cmake

    r219908 r219960  
    156156WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
    157157WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
    158 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
    159158WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON)
    160159WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)

  • trunk/Source/cmake/OptionsMac.cmake

    r219724 r219960  
    106106WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY PRIVATE OFF)
    107107
    108 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
    109108WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
    110109

  • trunk/Source/cmake/OptionsWPE.cmake

    r219954 r219960  
    1616WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
    1717WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
    18 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
    1918WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC OFF)
    2019WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r219954 r219960  
    100100    WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" PRIVATE OFF)
    101101    WEBKIT_OPTION_DEFINE(ENABLE_DASHBOARD_SUPPORT "Toggle dashboard support" PRIVATE OFF)
    102     WEBKIT_OPTION_DEFINE(ENABLE_DATABASE_PROCESS "Toggle database process support in WebKit2" PRIVATE OFF)
    103102    WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" PRIVATE OFF)
    104103    WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" PRIVATE OFF)
Note: See TracChangeset for help on using the changeset viewer.