summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 19:33:52 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 19:33:52 +0000
commitb5717a4f9f66283a9fe04ae1f9a3a89920d5b6b0 (patch)
tree9d14cf64e2cbeed63b232ba09a8c1274280d81b0 /webkit/support
parentbbdfcab9e264df0f264f56d8cb5f7ef61e5f96b6 (diff)
downloadchromium_src-b5717a4f9f66283a9fe04ae1f9a3a89920d5b6b0.zip
chromium_src-b5717a4f9f66283a9fe04ae1f9a3a89920d5b6b0.tar.gz
chromium_src-b5717a4f9f66283a9fe04ae1f9a3a89920d5b6b0.tar.bz2
Prefer ScopedNestableTaskAllower over manual save/restore
Cleanup. Changes various calls sites to use the ScopedNestableTaskAllower class to save/restore nestable task state. BUG=None TEST=Existing unit tests R=jar@chromium.org, scottbyer@chromium.org, sky@chromium.org, akalin@chromium.org, rsleevi@chromium.org, brettw@chromium.org, tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/9384024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 8c312ef..db6be26 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -213,10 +213,8 @@ class WebKitClientMessageLoopImpl
message_loop_ = NULL;
}
virtual void run() {
- bool old_state = message_loop_->NestableTasksAllowed();
- message_loop_->SetNestableTasksAllowed(true);
+ MessageLoop::ScopedNestableTaskAllower allow(message_loop_);
message_loop_->Run();
- message_loop_->SetNestableTasksAllowed(old_state);
}
virtual void quitNow() {
message_loop_->QuitNow();
@@ -450,10 +448,8 @@ void MessageLoopSetNestableTasksAllowed(bool allowed) {
void DispatchMessageLoop() {
MessageLoop* current = MessageLoop::current();
- bool old_state = current->NestableTasksAllowed();
- current->SetNestableTasksAllowed(true);
+ MessageLoop::ScopedNestableTaskAllower allow(current);
current->RunAllPending();
- current->SetNestableTasksAllowed(old_state);
}
WebDevToolsAgentClient::WebKitClientMessageLoop* CreateDevToolsMessageLoop() {