Add iterator support to FontFaceSet

Source/core/css/FontFaceSet.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 369 matching lines @@
 
     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
             callback->handleItem(face, face, const_cast<FontFaceSet*>(this));
     }
 }
 
+Iterator* FontFaceSet::keys()
+{
+    return new FontFaceSetIterator(this, FontFaceSetIterator::Keys);
+}
+
+Iterator* FontFaceSet::values()
+{
+    return new FontFaceSetIterator(this, FontFaceSetIterator::Values);
+}
+
+Iterator* FontFaceSet::entries()
+{
+    return new FontFaceSetIterator(this, FontFaceSetIterator::Entries);
+}
+
 unsigned long FontFaceSet::size() const
 {
     if (!inActiveDocumentContext())
         return m_nonCSSConnectedFaces.size();
     return cssConnectedFontFaceList().size() + m_nonCSSConnectedFaces.size();
 }
 
+FontFace* FontFaceSet::fontFaceAt(size_t index) const
+{
+    if (inActiveDocumentContext()) {
+        const WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> >& cssConnectedFaces = cssConnectedFontFaceList();
+        if (index < cssConnectedFaces.size()) {
+            WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> >::const_iterator it = cssConnectedFaces.begin();
+            for (size_t i = 0; i < index; i++)
+                ++it;
+            return it->get();
+        }
+        index -= cssConnectedFaces.size();
+    }
+    if (index < m_nonCSSConnectedFaces.size()) {
+        WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> >::const_iterator it =  m_nonCSSConnectedFaces.begin();
+        for (size_t i = 0; i < index; i++)
+            ++it;
+        return it->get();
+    }
+    return 0;
+}
+
 void FontFaceSet::fireDoneEventIfPossible()
 {
     if (m_shouldFireLoadingEvent)
         return;
     if (!m_loadingFonts.isEmpty() || (!hasLoadedFonts() && m_readyResolvers.isEmpty()))
         return;
 
     // If the layout was invalidated in between when we thought layout
     // was updated and when we're ready to fire the event, just wait
     // until after the next layout before firing events.
@@ skipping 178 matching lines @@
 {
     visitor->trace(m_loadingFonts);
     visitor->trace(m_loadedFonts);
     visitor->trace(m_failedFonts);
     visitor->trace(m_nonCSSConnectedFaces);
     DocumentSupplement::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 #endif
 
+ScriptValue FontFaceSet::FontFaceSetIterator::next(ScriptState* scriptState, ExceptionState&)
+{
+    FontFace* fontFace = m_fontFaceSet->fontFaceAt(m_index);
+    if (!fontFace)
+        return ScriptValue(scriptState, v8DoneIteratorResult(scriptState->isolate()));
+    m_index++;
+    if (m_kind == FontFaceSetIterator::Entries) {
+        Vector<ScriptValue> entry;
+        ScriptValue value = ScriptValue(scriptState, V8ValueTraits<FontFace*>::toV8Value(fontFace, scriptState->context()->Global(), scriptState->isolate()));

[yhirano, 2014/09/11 08:04:45]

You can include bindings/core/v8/V8FontFaceSet.h and use toV8.
I'm sorry for the policy change.
Please see https://codereview.chromium.org/513203002/#msg7 and
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...
.

[Kunihiko Sakamoto, 2014/09/11 10:47:35]

Ah good to know. Thanks.

+        entry.append(value);
+        entry.append(value);
+        return ScriptValue(scriptState, v8IteratorResult(scriptState, entry));
+    }
+    return ScriptValue(scriptState, v8IteratorResult(scriptState, fontFace));
+}
+
 } // namespace blink