From 04f19da143d8d119b781cfa1574c3acc47e4c61c Mon Sep 17 00:00:00 2001 From: nyquist Date: Tue, 8 Mar 2016 00:01:50 -0800 Subject: Revert of Use v8::MicrotasksScope internally in V8RecursionScope. (patchset #5 id:80001 of https://codereview.chromium.org/1743763004/ ) Reason for revert: Causes content_unittests to fail on GinJavaBridgeValueConverterTest.TypedArrays for Android on a bunch of testers: Marshmallow Tablet Tester - https://uberchromegw.corp.google.com/i/chromium.android/builders/Marshmallow%20Tablet%20Tester/builds/3117 Marshmallow 64 bit Tester - https://uberchromegw.corp.google.com/i/chromium.android/builders/Marshmallow%2064%20bit%20Tester/builds/1010 Lollipop Tablet Tester - https://uberchromegw.corp.google.com/i/chromium.android/builders/Lollipop%20Tablet%20Tester/builds/2108 Lollipop Phone Tester - https://uberchromegw.corp.google.com/i/chromium.android/builders/Lollipop%20Phone%20Tester/builds/3403 Lollipop Low-end Tester - https://uberchromegw.corp.google.com/i/chromium.android/builders/Lollipop%20Low-end%20Tester/builds/2681 git bisect succesfully identified this CL as the culprit: 83013584d091473d3a5fee6a823bc63b223a472c is the first bad commit See http://crbug.com/592906 for details. Original issue's description: > Use v8::MicrotasksScope internally in V8RecursionScope. > > If this sticks we can just remove V8RecursionScope and WebScopedMicrotaskSuppression, > along with other cleanups. > > BUG=585949 > > Committed: https://crrev.com/83013584d091473d3a5fee6a823bc63b223a472c > Cr-Commit-Position: refs/heads/master@{#379574} TBR=jochen@chromium.org,adamk@chromium.org,dgozman@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=585949 Review URL: https://codereview.chromium.org/1765423004 Cr-Commit-Position: refs/heads/master@{#379781} --- extensions/renderer/activity_log_converter_strategy_unittest.cc | 2 -- extensions/renderer/api_test_base.cc | 2 +- extensions/renderer/module_system_test.cc | 2 +- extensions/renderer/safe_builtins.cc | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'extensions/renderer') diff --git a/extensions/renderer/activity_log_converter_strategy_unittest.cc b/extensions/renderer/activity_log_converter_strategy_unittest.cc index aa80447..9237cad 100644 --- a/extensions/renderer/activity_log_converter_strategy_unittest.cc +++ b/extensions/renderer/activity_log_converter_strategy_unittest.cc @@ -6,7 +6,6 @@ #include "base/values.h" #include "extensions/renderer/activity_log_converter_strategy.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" #include "v8/include/v8.h" using content::V8ValueConverter; @@ -123,7 +122,6 @@ TEST_F(ActivityLogConverterStrategyTest, ConversionTest) { "};" "})();"; - blink::WebScopedMicrotaskSuppression microtasks_scope; v8::Local script( v8::Script::Compile(v8::String::NewFromUtf8(isolate_, source))); v8::Local v8_object = script->Run().As(); diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc index 79f95e2..abf868b 100644 --- a/extensions/renderer/api_test_base.cc +++ b/extensions/renderer/api_test_base.cc @@ -214,7 +214,7 @@ void ApiTestEnvironment::RunTestInner(const std::string& test_name, } void ApiTestEnvironment::RunPromisesAgain() { - v8::MicrotasksScope::PerformCheckpoint(env()->isolate()); + env()->isolate()->RunMicrotasks(); base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&ApiTestEnvironment::RunPromisesAgain, base::Unretained(this))); diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc index 06a4d55..68c4bd1 100644 --- a/extensions/renderer/module_system_test.cc +++ b/extensions/renderer/module_system_test.cc @@ -253,7 +253,7 @@ void ModuleSystemTest::ExpectNoAssertionsMade() { } void ModuleSystemTest::RunResolvedPromises() { - v8::MicrotasksScope::PerformCheckpoint(isolate_); + isolate_->RunMicrotasks(); } } // namespace extensions diff --git a/extensions/renderer/safe_builtins.cc b/extensions/renderer/safe_builtins.cc index 3a66eaf..3bfa01a 100644 --- a/extensions/renderer/safe_builtins.cc +++ b/extensions/renderer/safe_builtins.cc @@ -9,7 +9,6 @@ #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 { @@ -201,7 +200,6 @@ class ExtensionImpl : public v8::Extension { return; } - blink::WebScopedMicrotaskSuppression microtasks_scope; v8::Local return_value; if (function->Call(context, recv, argc, argv.get()).ToLocal(&return_value)) info.GetReturnValue().Set(return_value); -- cgit v1.1