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

Unified Diff: third_party/WebKit/Source/core/testing/Internals.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
Index: third_party/WebKit/Source/core/testing/Internals.cpp
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 12f24bfed2be67659661d6b914e3efa236e2a7c2..be3f7e03f1f7161cee1fed0a77be819678a57385 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -244,14 +244,14 @@ void Internals::resetToConsistentState(Page* page)
}
Internals::Internals(ScriptState* scriptState)
- : ContextLifecycleObserver(scriptState->executionContext())
+ : ContextLifecycleObserver(scriptState->getExecutionContext())
, m_runtimeFlags(InternalRuntimeFlags::create())
{
}
Document* Internals::contextDocument() const
{
- return toDocument(executionContext());
+ return toDocument(getExecutionContext());
}
LocalFrame* Internals::frame() const
@@ -2283,7 +2283,7 @@ private:
v8::Local<v8::Value> v8Value = value.v8Value();
ASSERT(v8Value->IsNumber());
int intValue = v8Value.As<v8::Integer>()->Value();
- return ScriptValue(scriptState(), v8::Integer::New(scriptState()->isolate(), intValue + 1));
+ return ScriptValue(getScriptState(), v8::Integer::New(getScriptState()->isolate(), intValue + 1));
}
};

Powered by Google App Engine
This is Rietveld 408576698