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

Unified Diff: Source/core/css/FontFaceSet.cpp

Issue 337343002: IDL: make optional arguments (without default) explicit sometimes Base URL: https://chromium.googlesource.com/chromium/blink.git@idl-default-arguments-next
Patch Set: Created 6 years, 4 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 | « Source/core/css/FontFaceSet.h ('k') | Source/core/css/MediaQueryList.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/FontFaceSet.cpp
diff --git a/Source/core/css/FontFaceSet.cpp b/Source/core/css/FontFaceSet.cpp
index 253e7db3f7e2b167c1469b4e2edbe8f8b149115d..23f6ca77e7f938eb4842997f9131749ce355140f 100644
--- a/Source/core/css/FontFaceSet.cpp
+++ b/Source/core/css/FontFaceSet.cpp
@@ -357,17 +357,7 @@ bool FontFaceSet::isCSSConnectedFontFace(FontFace* fontFace) const
return cssConnectedFontFaceList().contains(fontFace);
}
-void FontFaceSet::forEach(PassOwnPtr<FontFaceSetForEachCallback> callback, ScriptValue& thisArg) const
-{
- forEachInternal(callback, &thisArg);
-}
-
-void FontFaceSet::forEach(PassOwnPtr<FontFaceSetForEachCallback> callback) const
-{
- forEachInternal(callback, 0);
-}
-
-void FontFaceSet::forEachInternal(PassOwnPtr<FontFaceSetForEachCallback> callback, ScriptValue* thisArg) const
+void FontFaceSet::forEach(PassOwnPtr<FontFaceSetForEachCallback> callback, const Optional<ScriptValue>& thisArg) const
{
if (!inActiveDocumentContext())
return;
@@ -381,10 +371,10 @@ void FontFaceSet::forEachInternal(PassOwnPtr<FontFaceSetForEachCallback> callbac
for (size_t i = 0; i < fontFaces.size(); ++i) {
FontFace* face = fontFaces[i].get();
- if (thisArg)
- callback->handleItem(*thisArg, face, face, const_cast<FontFaceSet*>(this));
- else
+ if (thisArg.isMissing())
callback->handleItem(face, face, const_cast<FontFaceSet*>(this));
+ else
+ callback->handleItem(thisArg.get(), face, face, const_cast<FontFaceSet*>(this));
}
}
« no previous file with comments | « Source/core/css/FontFaceSet.h ('k') | Source/core/css/MediaQueryList.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698