Add iterator support to FontFaceSet

Source/core/css/FontFaceSet.h

 /*
  * 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 12 matching lines @@
  * DAMAGE.
  */
 
 #ifndef FontFaceSet_h
 #define FontFaceSet_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "core/css/FontFace.h"
 #include "core/css/FontFaceSetForEachCallback.h"
 #include "core/dom/ActiveDOMObject.h"
+#include "core/dom/Iterator.h"
 #include "core/events/EventListener.h"
 #include "core/events/EventTarget.h"
 #include "platform/AsyncMethodRunner.h"
 #include "platform/RefCountedSupplement.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
 // Mac OS X 10.6 SDK defines check() macro that interfares with our check() method
 #ifdef check
@@ skipping 34 matching lines @@
     bool check(const String& font, const String& text, ExceptionState&);
     ScriptPromise load(ScriptState*, const String& font, const String& text);
     ScriptPromise ready(ScriptState*);
 
     void add(FontFace*, ExceptionState&);
     void clear();
     bool remove(FontFace*, ExceptionState&);
     void forEach(PassOwnPtrWillBeRawPtr<FontFaceSetForEachCallback>, const ScriptValue& thisArg) const;
     void forEach(PassOwnPtrWillBeRawPtr<FontFaceSetForEachCallback>) const;
     bool has(FontFace*, ExceptionState&) const;
+    Iterator* keys();
+    Iterator* values();
+    Iterator* entries();
+    Iterator* iterator(ScriptState*, ExceptionState&) { return values(); }
 
     unsigned long size() const;
     AtomicString status() const;
 
+    FontFace* fontFaceAt(size_t index) const;
+
     virtual ExecutionContext* executionContext() const OVERRIDE;
     virtual const AtomicString& interfaceName() const OVERRIDE;
 
     Document* document() const;
 
     void didLayout();
     void beginFontLoading(FontFace*);
     void fontLoaded(FontFace*);
     void loadError(FontFace*);
 
     // ActiveDOMObject
     virtual void suspend() OVERRIDE;
     virtual void resume() OVERRIDE;
     virtual void stop() OVERRIDE;
 
     static PassRefPtrWillBeRawPtr<FontFaceSet> from(Document&);
     static void didLayout(Document&);
 
     void addFontFacesToFontFaceCache(FontFaceCache*, CSSFontSelector*);
 
 #if ENABLE(OILPAN)
     virtual void trace(Visitor*) OVERRIDE;
 #endif
 
 private:
+    class FontFaceSetIterator FINAL : public Iterator {
+    public:
+        enum Kind { Keys, Values, Entries };
+
+        FontFaceSetIterator(PassRefPtrWillBeRawPtr<FontFaceSet> fontFaceSet, Kind kind)
+            : m_fontFaceSet(fontFaceSet)
+            , m_kind(kind)
+            , m_index(0) { }
+        ~FontFaceSetIterator() { }

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

+virtual

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

Done.

+        virtual ScriptValue next(ScriptState*, ExceptionState&) OVERRIDE;
+        virtual ScriptValue next(ScriptState* scriptState, ScriptValue, ExceptionState& exceptionState) OVERRIDE
+        {
+            return next(scriptState, exceptionState);
+        }
+
+        virtual void trace(Visitor* visitor) OVERRIDE
+        {
+            visitor->trace(m_fontFaceSet);
+            Iterator::trace(visitor);
+        }
+
+    private:
+        RefPtrWillBeMember<FontFaceSet> m_fontFaceSet;
+        Kind m_kind;
+        size_t m_index;
+    };
+
     static PassRefPtrWillBeRawPtr<FontFaceSet> create(Document& document)
     {
         return adoptRefWillBeNoop(new FontFaceSet(document));
     }
 
     class FontLoadHistogram {
     public:
         enum Status { NoWebFonts, HadBlankText, DidNotHaveBlankText, Reported };
         FontLoadHistogram() : m_status(NoWebFonts), m_count(0), m_recorded(false) { }
         void incrementCount() { m_count++; }
@@ skipping 30 matching lines @@
     WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> > m_nonCSSConnectedFaces;
 
     AsyncMethodRunner<FontFaceSet> m_asyncRunner;
 
     FontLoadHistogram m_histogram;
 };
 
 } // namespace blink
 
 #endif // FontFaceSet_h