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

Unified Diff: third_party/WebKit/Source/core/css/FontFaceSet.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/css/FontFaceSet.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
index 06f1c462d3da8c0a45f8f609c990225a9e6c61cc..2673d2860a121f3311d955eb89c2b9d65495f18a 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -117,7 +117,7 @@ FontFaceSet::FontFaceSet(Document& document)
: ActiveDOMObject(&document)
, m_shouldFireLoadingEvent(false)
, m_isLoading(false)
- , m_ready(new ReadyProperty(executionContext(), this, ReadyProperty::Ready))
+ , m_ready(new ReadyProperty(getExecutionContext(), this, ReadyProperty::Ready))
, m_asyncRunner(AsyncMethodRunner<FontFaceSet>::create(this, &FontFaceSet::handlePendingEventsAndPromises))
{
suspendIfNeeded();
@@ -132,12 +132,12 @@ FontFaceSet::~FontFaceSet()
Document* FontFaceSet::document() const
{
- return toDocument(executionContext());
+ return toDocument(getExecutionContext());
}
bool FontFaceSet::inActiveDocumentContext() const
{
- ExecutionContext* context = executionContext();
+ ExecutionContext* context = getExecutionContext();
return context && toDocument(context)->isActive();
}
@@ -152,9 +152,9 @@ const AtomicString& FontFaceSet::interfaceName() const
return EventTargetNames::FontFaceSet;
}
-ExecutionContext* FontFaceSet::executionContext() const
+ExecutionContext* FontFaceSet::getExecutionContext() const
{
- return ActiveDOMObject::executionContext();
+ return ActiveDOMObject::getExecutionContext();
}
AtomicString FontFaceSet::status() const
@@ -393,7 +393,7 @@ ScriptPromise FontFaceSet::load(ScriptState* scriptState, const String& fontStri
RefPtrWillBeRawPtr<LoadFontPromiseResolver> resolver = LoadFontPromiseResolver::create(faces, scriptState);
ScriptPromise promise = resolver->promise();
- resolver->loadFonts(executionContext()); // After this, resolver->promise() may return null.
+ resolver->loadFonts(getExecutionContext()); // After this, resolver->promise() may return null.
return promise;
}
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFaceSet.h ('k') | third_party/WebKit/Source/core/css/MediaQueryList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698