diff options
| author | dewittj <dewittj@chromium.org> | 2016-03-15 13:49:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-15 20:52:45 +0000 |
| commit | 0bfd25d460a1cff98f9f0573a0d6cc072ecbe359 (patch) | |
| tree | 7ab48054430a4554246176f08a4d6c4045c63240 /chrome/test/base/v8_unit_test.cc | |
| parent | 04c8fd5e7c57f75262f477e6ac94e18ca76b6371 (diff) | |
| download | chromium_src-0bfd25d460a1cff98f9f0573a0d6cc072ecbe359.zip chromium_src-0bfd25d460a1cff98f9f0573a0d6cc072ecbe359.tar.gz chromium_src-0bfd25d460a1cff98f9f0573a0d6cc072ecbe359.tar.bz2 | |
Revert of Remove V8RecrusionScope, cleanup call sites. (patchset #8 id:140001 of https://codereview.chromium.org/1769273004/ )
Reason for revert:
Speculative revert, this patch most likely to cause browser_tests failures for Linux (https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/26678) Windows (https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/46875) and Mac
Original issue's description:
> Remove V8RecrusionScope, cleanup call sites.
>
> - blink-side usages migrated to v8::MicrotasksScope;
> - clients of WebScopedMicrotaskSuppression migrated to v8::MicrotasksScope;
> - moved Microtask.{h,cpp} to bindings/core/v8;
> - removed extra wrappers from V8DebuggerClient;
> - fixed a couple of inspector tests which relied on trace event not emitted from debugger anymore.
>
> BUG=585949
>
> Committed: https://crrev.com/133a1579d2a087acdcdd4e9247062edb0bd1e5a3
> Cr-Commit-Position: refs/heads/master@{#381103}
Also reverts https://codereview.chromium.org/1807513002/,
commit 0d194e62ee499d1310e74537aecfa5c6543b8811
Author: dgozman <dgozman@chromium.org>
Also reverts https://codereview.chromium.org/1805543002
commit 974fa818537a8d00fb3537a836db79e2539a7889
Author: dgozman <dgozman@chromium.org>
R=csharp@chromium.org
TBR=jochen@chromium.org,pfeldman@chromium.org,dgozman@chromium.org
BUG=585949,594974
NOTRY=true
Review URL: https://codereview.chromium.org/1806643002
Cr-Commit-Position: refs/heads/master@{#381305}
Diffstat (limited to 'chrome/test/base/v8_unit_test.cc')
| -rw-r--r-- | chrome/test/base/v8_unit_test.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/test/base/v8_unit_test.cc b/chrome/test/base/v8_unit_test.cc index 80ac9fb..392ff45 100644 --- a/chrome/test/base/v8_unit_test.cc +++ b/chrome/test/base/v8_unit_test.cc @@ -11,6 +11,7 @@ #include "base/strings/stringprintf.h" #include "chrome/common/chrome_paths.h" #include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" namespace { @@ -95,8 +96,7 @@ bool V8UnitTest::RunJavascriptTestF(const std::string& test_fixture, v8::Local<v8::Context> context = v8::Local<v8::Context>::New(isolate, context_); v8::Context::Scope context_scope(context); - v8::MicrotasksScope microtasks( - isolate, v8::MicrotasksScope::kDoNotRunMicrotasks); + blink::WebScopedMicrotaskSuppression microtasks_scope; v8::Local<v8::Value> function_property = context->Global()->Get(v8::String::NewFromUtf8(isolate, "runTest")); @@ -211,8 +211,7 @@ void V8UnitTest::ExecuteScriptInContext(const base::StringPiece& script_source, v8::Local<v8::Context> context = v8::Local<v8::Context>::New(isolate, context_); v8::Context::Scope context_scope(context); - v8::MicrotasksScope microtasks( - isolate, v8::MicrotasksScope::kDoNotRunMicrotasks); + blink::WebScopedMicrotaskSuppression microtasks_scope; v8::Local<v8::String> source = v8::String::NewFromUtf8(isolate, script_source.data(), @@ -261,8 +260,7 @@ void V8UnitTest::TestFunction(const std::string& function_name) { v8::Local<v8::Context> context = v8::Local<v8::Context>::New(isolate, context_); v8::Context::Scope context_scope(context); - v8::MicrotasksScope microtasks( - isolate, v8::MicrotasksScope::kDoNotRunMicrotasks); + blink::WebScopedMicrotaskSuppression microtasks_scope; v8::Local<v8::Value> function_property = context->Global()->Get( v8::String::NewFromUtf8(isolate, function_name.c_str())); |