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

Unified Diff: third_party/WebKit/Source/modules/worklet/Worklet.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/modules/worklet/Worklet.cpp
diff --git a/third_party/WebKit/Source/modules/worklet/Worklet.cpp b/third_party/WebKit/Source/modules/worklet/Worklet.cpp
index 59086a852730b1294f4e00059dfbfe90df280341..a12d417d19c8e361bff2c9aca41e3c15ff4d0f5f 100644
--- a/third_party/WebKit/Source/modules/worklet/Worklet.cpp
+++ b/third_party/WebKit/Source/modules/worklet/Worklet.cpp
@@ -24,13 +24,13 @@ Worklet* Worklet::create(LocalFrame* frame, ExecutionContext* executionContext)
Worklet::Worklet(LocalFrame* frame, ExecutionContext* executionContext)
: ActiveDOMObject(executionContext)
- , m_workletGlobalScope(WorkletGlobalScope::create(frame, executionContext->url(), executionContext->userAgent(), executionContext->securityOrigin(), toIsolate(executionContext)))
+ , m_workletGlobalScope(WorkletGlobalScope::create(frame, executionContext->url(), executionContext->userAgent(), executionContext->getSecurityOrigin(), toIsolate(executionContext)))
{
}
ScriptPromise Worklet::import(ScriptState* scriptState, const String& url)
{
- KURL scriptURL = executionContext()->completeURL(url);
+ KURL scriptURL = getExecutionContext()->completeURL(url);
if (!scriptURL.isValid()) {
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SyntaxError, "'" + url + "' is not a valid URL."));
}
@@ -49,8 +49,8 @@ ScriptPromise Worklet::import(ScriptState* scriptState, const String& url)
// NOTE: WorkerScriptLoader may synchronously invoke its callbacks
// (resolving the promise) before we return it.
m_scriptLoaders.append(WorkerScriptLoader::create());
- m_scriptLoaders.last()->loadAsynchronously(*executionContext(), scriptURL, DenyCrossOriginRequests,
- executionContext()->securityContext().addressSpace(),
+ m_scriptLoaders.last()->loadAsynchronously(*getExecutionContext(), scriptURL, DenyCrossOriginRequests,
+ getExecutionContext()->securityContext().addressSpace(),
bind(&Worklet::onResponse, this),
bind(&Worklet::onFinished, this, m_scriptLoaders.last().get(), resolver));
« no previous file with comments | « third_party/WebKit/Source/modules/webusb/USBDevice.cpp ('k') | third_party/WebKit/Source/modules/worklet/WorkletGlobalScope.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698