summaryrefslogtreecommitdiffstats
path: root/extensions/renderer/safe_builtins.cc
diff options
context:
space:
mode:
authordgozman <dgozman@chromium.org>2016-03-10 23:50:47 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-11 07:53:09 +0000
commitfdfd5d17ab08e528799125a242893f6f5dcbea43 (patch)
treeeef0b94e34f93d482f3e8b11b0b0cb121f6a19f2 /extensions/renderer/safe_builtins.cc
parent119f7e1b215f82cf545565e9d83a80ca650c6e72 (diff)
downloadchromium_src-fdfd5d17ab08e528799125a242893f6f5dcbea43.zip
chromium_src-fdfd5d17ab08e528799125a242893f6f5dcbea43.tar.gz
chromium_src-fdfd5d17ab08e528799125a242893f6f5dcbea43.tar.bz2
Use v8::MicrotasksScope internally in V8RecursionScope.
If this sticks we can just remove V8RecursionScope and WebScopedMicrotaskSuppression, along with other cleanups. Attempt #3. First one broke GinJavaBridgeValueConverterTest.TypedArrays. Second one broke FileManagerBrowserTest family on ChromeOS. BUG=585949 Review URL: https://codereview.chromium.org/1743763004 Cr-Commit-Position: refs/heads/master@{#380570}
Diffstat (limited to 'extensions/renderer/safe_builtins.cc')
-rw-r--r--extensions/renderer/safe_builtins.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/extensions/renderer/safe_builtins.cc b/extensions/renderer/safe_builtins.cc
index 3bfa01a..3a66eaf 100644
--- a/extensions/renderer/safe_builtins.cc
+++ b/extensions/renderer/safe_builtins.cc
@@ -9,6 +9,7 @@
#include "base/strings/stringprintf.h"
#include "extensions/renderer/script_context.h"
#include "extensions/renderer/v8_helpers.h"
+#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
namespace extensions {
@@ -200,6 +201,7 @@ class ExtensionImpl : public v8::Extension {
return;
}
+ blink::WebScopedMicrotaskSuppression microtasks_scope;
v8::Local<v8::Value> return_value;
if (function->Call(context, recv, argc, argv.get()).ToLocal(&return_value))
info.GetReturnValue().Set(return_value);