diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/Shared/ChildProcess.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/Shared/ChildProcess.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/ChildProcess.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebKit2/Shared/ChildProcess.cpp b/Source/WebKit2/Shared/ChildProcess.cpp index b65eebe2c..344d54c91 100644 --- a/Source/WebKit2/Shared/ChildProcess.cpp +++ b/Source/WebKit2/Shared/ChildProcess.cpp @@ -60,9 +60,15 @@ ChildProcess::ChildProcess() : m_terminationTimeout(0) , m_terminationCounter(0) , m_terminationTimer(RunLoop::main(), this, &ChildProcess::terminationTimerFired) +#if PLATFORM(MAC) + , m_applicationIsOccluded(false) +#endif { // FIXME: The termination timer should not be scheduled on the main run loop. // It won't work with the threaded mode, but it's not really useful anyway as is. +#if PLATFORM(MAC) + disableProcessSuppression(processSuppressionVisibleApplicationReason); +#endif } ChildProcess::~ChildProcess() |