CSS Font Loading: make FontFaceSet Setlike

third_party/WebKit/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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
 
 #ifndef FontFaceSet_h
 #define FontFaceSet_h
 
+#include "bindings/core/v8/Iterable.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "core/css/FontFace.h"
 #include "core/css/FontFaceSetForEachCallback.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventListener.h"
 #include "core/events/EventTarget.h"
 #include "platform/AsyncMethodRunner.h"
 #include "platform/RefCountedSupplement.h"
 #include "wtf/Allocator.h"
 #include "wtf/PassRefPtr.h"
@@ skipping 12 matching lines @@
 class CSSFontSelector;
 class Dictionary;
 class Document;
 class ExceptionState;
 class Font;
 class FontFaceCache;
 class FontResource;
 class ExecutionContext;
 
 #if ENABLE(OILPAN)
-class FontFaceSet final : public EventTargetWithInlineData, public HeapSupplement<Document>, public ActiveDOMObject {
+class FontFaceSet final : public EventTargetWithInlineData, public HeapSupplement<Document>, public ActiveDOMObject, public ValueIterable<RefPtrWillBeMember<FontFace>> {
     USING_GARBAGE_COLLECTED_MIXIN(FontFaceSet);
     using SupplementType = HeapSupplement<Document>;
 #else
-class FontFaceSet final : public EventTargetWithInlineData, public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject {
+class FontFaceSet final : public EventTargetWithInlineData, public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public ValueIterable<RefPtrWillBeMember<FontFace>> {
     REFCOUNTED_EVENT_TARGET(FontFaceSet);
     using SupplementType = RefCountedSupplement<Document, FontFaceSet>;
 #endif
     DEFINE_WRAPPERTYPEINFO();
 public:
     ~FontFaceSet() override;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loading);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingdone);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingerror);
 
     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(FontFaceSetForEachCallback*, const ScriptValue& thisArg) const;
-    void forEach(FontFaceSetForEachCallback*) const;
-    bool has(FontFace*, ExceptionState&) const;
+    bool hasForBinding(ScriptState*, const PassRefPtrWillBeRawPtr<FontFace>&, ExceptionState&) const;

[Takashi Toyoshima, 2015/10/16 06:36:34]

I noticed the type was wrong here.
The last patch set just changed the type PassRefPtrWillBeRawPtr here.

 
-    unsigned long size() const;
+    size_t size() const;
     AtomicString status() const;
 
     ExecutionContext* executionContext() const override;
     const AtomicString& interfaceName() const override;
 
     Document* document() const;
 
     void didLayout();
     void beginFontLoading(FontFace*);
     void fontLoaded(FontFace*);
@@ skipping 10 matching lines @@
     void addFontFacesToFontFaceCache(FontFaceCache*, CSSFontSelector*);
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     static PassRefPtrWillBeRawPtr<FontFaceSet> create(Document& document)
     {
         return adoptRefWillBeNoop(new FontFaceSet(document));
     }
 
+    ValueIterable<RefPtrWillBeMember<FontFace>>::IterationSource* startIteration(ScriptState*, ExceptionState&) override;
+
+    class IterationSource final : public ValueIterable<RefPtrWillBeMember<FontFace>>::IterationSource {
+    public:
+        IterationSource(const WillBeHeapVector<RefPtrWillBeMember<FontFace>> fontFaces)
+            : m_index(0)
+            , m_fontFaces(fontFaces) { }
+        bool next(ScriptState*, RefPtrWillBeMember<FontFace>&, ExceptionState&) override;
+    private:
+        size_t m_index;
+        WillBeHeapVector<RefPtrWillBeMember<FontFace>> m_fontFaces;
+    };
+
     class FontLoadHistogram {
         DISALLOW_ALLOCATION();
     public:
         enum Status { NoWebFonts, HadBlankText, DidNotHaveBlankText, Reported };
         FontLoadHistogram() : m_status(NoWebFonts), m_count(0), m_recorded(false) { }
         void incrementCount() { m_count++; }
         void updateStatus(FontFace*);
         void record();
 
     private:
@@ skipping 28 matching lines @@
     WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> m_nonCSSConnectedFaces;
 
     AsyncMethodRunner<FontFaceSet> m_asyncRunner;
 
     FontLoadHistogram m_histogram;
 };
 
 } // namespace blink
 
 #endif // FontFaceSet_h