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

Unified Diff: third_party/WebKit/Source/core/css/FontFace.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/FontFace.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
index 3c49e503f5fe142314b280f1ab76e4e95eafd2ff..32f009aa06d556fa8223d34b37b8eff81a724594 100644
--- a/third_party/WebKit/Source/core/css/FontFace.cpp
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -361,7 +361,7 @@ void FontFace::setError(DOMException* error)
ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState)
{
if (!m_loadedProperty) {
- m_loadedProperty = new LoadedProperty(scriptState->executionContext(), this, LoadedProperty::Loaded);
+ m_loadedProperty = new LoadedProperty(scriptState->getExecutionContext(), this, LoadedProperty::Loaded);
if (m_status == Loaded)
m_loadedProperty->resolve(this);
else if (m_status == Error)
@@ -372,7 +372,7 @@ ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState)
ScriptPromise FontFace::load(ScriptState* scriptState)
{
- loadInternal(scriptState->executionContext());
+ loadInternal(scriptState->getExecutionContext());
return fontStatusPromise(scriptState);
}
@@ -646,7 +646,7 @@ bool FontFace::hadBlankText() const
bool FontFace::hasPendingActivity() const
{
- return m_status == Loading && executionContext() && !executionContext()->activeDOMObjectsAreStopped();
+ return m_status == Loading && getExecutionContext() && !getExecutionContext()->activeDOMObjectsAreStopped();
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSStyleSheet.cpp ('k') | third_party/WebKit/Source/core/css/FontFaceSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698