Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Unified Diff: third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp b/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp
index 991b2848552d890b185e2dd32caff78a8dd715f8..ff068ad65fa356b420afc58cc5df964cd9d78d4f 100644
--- a/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ResizeObserverTest.cpp
@@ -108,16 +108,17 @@ TEST_F(ResizeObserverUnitTest, TestMemoryLeaks) {
ASSERT_EQ(observers.size(), 0U);
v8::HandleScope scope(v8::Isolate::GetCurrent());
- ScriptController& script = GetDocument().ExecutingFrame()->Script();
+ ScriptController& script_controller =
+ GetDocument().ExecutingFrame()->GetScriptController();
//
// Test whether ResizeObserver is kept alive by direct JS reference
//
- script.ExecuteScriptInMainWorldAndReturnValue(
+ script_controller.ExecuteScriptInMainWorldAndReturnValue(
ScriptSourceCode("var ro = new ResizeObserver( entries => {});"),
ScriptController::kExecuteScriptWhenScriptsDisabled);
ASSERT_EQ(observers.size(), 1U);
- script.ExecuteScriptInMainWorldAndReturnValue(
+ script_controller.ExecuteScriptInMainWorldAndReturnValue(
ScriptSourceCode("ro = undefined;"),
ScriptController::kExecuteScriptWhenScriptsDisabled);
V8GCController::CollectAllGarbageForTesting(v8::Isolate::GetCurrent());
@@ -127,7 +128,7 @@ TEST_F(ResizeObserverUnitTest, TestMemoryLeaks) {
//
// Test whether ResizeObserver is kept alive by an Element
//
- script.ExecuteScriptInMainWorldAndReturnValue(
+ script_controller.ExecuteScriptInMainWorldAndReturnValue(
ScriptSourceCode("var ro = new ResizeObserver( () => {});"
"var el = document.createElement('div');"
"ro.observe(el);"
@@ -137,7 +138,7 @@ TEST_F(ResizeObserverUnitTest, TestMemoryLeaks) {
V8GCController::CollectAllGarbageForTesting(v8::Isolate::GetCurrent());
WebHeap::CollectAllGarbageForTesting();
ASSERT_EQ(observers.size(), 1U);
- script.ExecuteScriptInMainWorldAndReturnValue(
+ script_controller.ExecuteScriptInMainWorldAndReturnValue(
ScriptSourceCode("el = undefined;"),
ScriptController::kExecuteScriptWhenScriptsDisabled);
V8GCController::CollectAllGarbageForTesting(v8::Isolate::GetCurrent());
« no previous file with comments | « third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698