ChangeLog

2011-04-14  Jessie Berlin  <jberlin@apple.com>

        Reviewed by NOBODY (OOPS!).

        WebKit2: Need a way to keep the WebProcess alive for testing purposes.

        https://bugs.webkit.org/show_bug.cgi?id=58592

        * UIProcess/API/C/WKContext.cpp:

        (WKContextSetWebProcessCanTerminateEarly):

        Call through to the WebContext.

        * UIProcess/API/C/WKContextPrivate.h:

        * UIProcess/WebContext.cpp:

        (WebKit::WebContext::WebContext):

        Initialize m_webProcessCanTerminateEarly to true.

        (WebKit::WebContext::setWebProcessCanTerminateEarly):

        If the web process is allowed to terminate early and shouldTerminate returns true, tell the

        WebProcess to terminate.

        (WebKit::WebContext::shouldTerminate):

        Return false if the web process is not allowed to terminate early.

        * UIProcess/WebContext.h:

2011-04-14  Anders Carlsson  <andersca@apple.com>

        Reviewed by Dan Bernstein.

83906

Source/WebKit2/UIProcess/WebContext.cpp

@@WebContext::WebContext(ProcessModel proc

    , m_shouldPaintNativeControls(true)

    , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)

#endif

129 , m_webProcessCanTerminateEarly(true)

{

#ifndef NDEBUG

    WebKit::initializeLogChannelsIfNecessary();

@@void WebContext::ensureWebProcess()

    m_pendingMessagesToPostToInjectedBundle.clear();

}

void WebContext::setWebProcessCanTerminateEarly(bool allowed)

{

    m_webProcessCanTerminateEarly = allowed;

    if (shouldTerminate(m_process.get()))

        m_process->terminate();

}

bool WebContext::shouldTerminate(WebProcessProxy* process)

{

    // FIXME: Once we support multiple processes per context, this assertion won't hold.

    ASSERT(process == m_process);

    if (!m_webProcessCanTerminateEarly)

        return false;

    if (!m_downloads.isEmpty())

        return false;

83869

Source/WebKit2/UIProcess/WebContext.h

@@public:

    bool shouldTerminate(WebProcessProxy*);

171 void setWebProcessCanTerminateEarly(bool);

172

private:

    WebContext(ProcessModel, const String& injectedBundlePath);

@@private:

    String m_overrideDatabaseDirectory;

    String m_overrideIconDatabasePath;

    String m_overrideLocalStorageDirectory;

265 bool m_webProcessCanTerminateEarly;

};

template<typename U> inline bool WebContext::sendToAllProcesses(const U& message)

83869

Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@void WKContextSetLocalStorageDirectory(W

{

    toImpl(contextRef)->setLocalStorageDirectory(toImpl(localStorageDirectory)->string());

}

void WKContextSetWebProcessCanTerminateEarly(WKContextRef contextRef, bool canTerminate)

{

    toImpl(contextRef)->setWebProcessCanTerminateEarly(canTerminate);

}

83869

Source/WebKit2/UIProcess/API/C/WKContextPrivate.h

@@WK_EXPORT void WKContextSetIconDatabaseP

WK_EXPORT void WKContextSetDatabaseDirectory(WKContextRef context, WKStringRef databaseDirectory);

WK_EXPORT void WKContextSetLocalStorageDirectory(WKContextRef context, WKStringRef localStorageDirectory);

// FIXME: This is a workaround for testing purposes only.

WK_EXPORT void WKContextSetWebProcessCanTerminateEarly(WKContextRef context, bool canTerminate);

#ifdef __cplusplus

}

#endif

83869