Bug 58485 – Convert WebProcess over to using disableTermination/enableTermination

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Anders Carlsson]

Convert WebProcess over to using disableTermination/enableTermination

[Anders Carlsson]

Created attachment 89470 [details]
Patch

[Adam Roben (:aroben)]

Comment on attachment 89470 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=89470&action=review

It's a little confusing that all the terminateIfPossible calls have turned into a temporary disabling of termination.

> Source/WebKit2/WebProcess/WebProcess.cpp:505
>  void WebProcess::removeWebPage(uint64_t pageID)
>  {
>      m_pageMap.remove(pageID);
> -    terminateIfPossible();
> +
> +    enableTermination();

Do we need to verify that pageID was in m_pageMap?

> Source/WebKit2/WebProcess/WebProcess.cpp:733
> +    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());

No need for either of the "WebProcess::"s.

> Source/WebKit2/WebProcess/WebProcess.cpp:755
> +    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());

Or here.

> Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp:158
> +    ChildProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());

Why ChildProcess and not WebProcess?

[Anders Carlsson]

(In reply to comment #2)
> (From update of attachment 89470 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=89470&action=review
> 
> It's a little confusing that all the terminateIfPossible calls have turned into a temporary disabling of termination.
> 
> > Source/WebKit2/WebProcess/WebProcess.cpp:505
> >  void WebProcess::removeWebPage(uint64_t pageID)
> >  {
> >      m_pageMap.remove(pageID);
> > -    terminateIfPossible();
> > +
> > +    enableTermination();
> 
> Do we need to verify that pageID was in m_pageMap?
> 

Not really, but I added an assertion.

> > Source/WebKit2/WebProcess/WebProcess.cpp:733
> > +    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
> 
> No need for either of the "WebProcess::"s.

changed WebProcess::shared() to *this.
> 
> > Source/WebKit2/WebProcess/WebProcess.cpp:755
> > +    WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
> 
> Or here.
> 
> > Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp:158
> > +    ChildProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
> 
> Why ChildProcess and not WebProcess?

Changed to WebProcess.

[Anders Carlsson]

Committed r83774: <http://trac.webkit.org/changeset/83774>