Commit 689a517f authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

Use RunScript() instead of RunScriptAndReturnValue() if possible

This CL removes all (but one in ClassicScript)
RunScriptAndReturnValue() calls ignoring return values.

This CL doesn't change the behavior.

There still remain
RunScriptInIsolatedWorldAndReturnValue() calls ignoring return values,
and they will be cleaned up by
https://chromium-review.googlesource.com/c/chromium/src/+/2413430.

Bug: 1111134
Change-Id: I27766d57b5a01b9cbfdef4166c75bfa9831338b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410105Reviewed-by: default avatarDominic Farolino <dom@chromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808209}
parent b49f79c4
......@@ -254,7 +254,6 @@ TEST_F(ResizeObserverUnitTest, TestMemoryLeaks) {
const HeapLinkedHashSet<WeakMember<ResizeObserver>>& observers =
controller.Observers();
ASSERT_EQ(observers.size(), 0U);
v8::HandleScope scope(v8::Isolate::GetCurrent());
LocalFrame* frame = Window().GetFrame();
......@@ -263,12 +262,10 @@ TEST_F(ResizeObserverUnitTest, TestMemoryLeaks) {
//
ClassicScript::CreateUnspecifiedScript(
ScriptSourceCode("var ro = new ResizeObserver( entries => {});"))
->RunScriptAndReturnValue(
frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
->RunScript(frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
ASSERT_EQ(observers.size(), 1U);
ClassicScript::CreateUnspecifiedScript(ScriptSourceCode("ro = undefined;"))
->RunScriptAndReturnValue(
frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
->RunScript(frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
ThreadState::Current()->CollectAllGarbageForTesting();
WebHeap::CollectAllGarbageForTesting();
ASSERT_EQ(observers.IsEmpty(), true);
......@@ -281,15 +278,13 @@ TEST_F(ResizeObserverUnitTest, TestMemoryLeaks) {
"var el = document.createElement('div');"
"ro.observe(el);"
"ro = undefined;"))
->RunScriptAndReturnValue(
frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
->RunScript(frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
ASSERT_EQ(observers.size(), 1U);
ThreadState::Current()->CollectAllGarbageForTesting();
WebHeap::CollectAllGarbageForTesting();
ASSERT_EQ(observers.size(), 1U);
ClassicScript::CreateUnspecifiedScript(ScriptSourceCode("el = undefined;"))
->RunScriptAndReturnValue(
frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
->RunScript(frame, ScriptController::kExecuteScriptWhenScriptsDisabled);
ThreadState::Current()->CollectAllGarbageForTesting();
WebHeap::CollectAllGarbageForTesting();
ASSERT_EQ(observers.IsEmpty(), true);
......
......@@ -107,7 +107,7 @@ class ModuleScriptTest : public ::testing::Test, public ParametrizedModuleTest {
ClassicScript::CreateUnspecifiedScript(
ScriptSourceCode("window.foo = undefined;"))
->RunScriptAndReturnValue(&scope.GetFrame());
->RunScript(&scope.GetFrame());
}
// Accessors for ModuleScript private members.
......@@ -249,7 +249,7 @@ TEST_P(ModuleScriptTest, V8CodeCacheWithoutDiscarding) {
ClassicScript::CreateUnspecifiedScript(
ScriptSourceCode(LargeSourceText(), ScriptSourceLocationType::kInternal,
cache_handler))
->RunScriptAndReturnValue(&scope.GetFrame());
->RunScript(&scope.GetFrame());
checkpoint.Call(4);
......@@ -390,7 +390,7 @@ TEST_P(ModuleScriptTest, V8CodeCacheWithDiscarding) {
ClassicScript::CreateUnspecifiedScript(
ScriptSourceCode(LargeSourceText(), ScriptSourceLocationType::kInternal,
cache_handler))
->RunScriptAndReturnValue(&scope.GetFrame());
->RunScript(&scope.GetFrame());
checkpoint.Call(4);
TestFoo(scope);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment