Rework MediaQueryMatcher to batch up listener notification

Source/core/css/MediaQueryMatcher.h

Index: Source/core/css/MediaQueryMatcher.h
diff --git a/Source/core/css/MediaQueryMatcher.h b/Source/core/css/MediaQueryMatcher.h
index c8c066934a8d9423212d53cf270532fb63edf0a1..3e71052ed4376f78310c1e834cc1312908834f33 100644
--- a/Source/core/css/MediaQueryMatcher.h
+++ b/Source/core/css/MediaQueryMatcher.h
@@ -42,47 +42,33 @@ class MediaQuerySet;
 class MediaQueryMatcher FINAL : public RefCountedWillBeGarbageCollected<MediaQueryMatcher> {
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQueryMatcher);
 public:
-    static PassRefPtrWillBeRawPtr<MediaQueryMatcher> create(Document* document) { return adoptRefWillBeNoop(new MediaQueryMatcher(document)); }
-    void documentDestroyed();
+    static PassRefPtrWillBeRawPtr<MediaQueryMatcher> create(Document& document) { return adoptRefWillBeNoop(new MediaQueryMatcher(document)); }
 
-    void addListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>, PassRefPtrWillBeRawPtr<MediaQueryList>);
-    void removeListener(MediaQueryListListener*, MediaQueryList*);
+    void documentDetached();
+
+    void addMediaQueryList(MediaQueryList*);
+    void removeMediaQueryList(MediaQueryList*);
 
     PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&);
 
-    unsigned evaluationRound() const { return m_evaluationRound; }
-    void styleResolverChanged();
+    void mediaChanged();
+
     bool evaluate(const MediaQuerySet*);
 
     void trace(Visitor*);
 
 private:
-    class Listener FINAL : public NoBaseWillBeGarbageCollected<Listener> {
-    public:
-        Listener(PassRefPtrWillBeRawPtr<MediaQueryListListener>, PassRefPtrWillBeRawPtr<MediaQueryList>);
-        void evaluate(ScriptState*, MediaQueryEvaluator*);
-
-        MediaQueryListListener* listener() { return m_listener.get(); }
-        MediaQueryList* query() { return m_query.get(); }
-
-        void trace(Visitor*);
-
-    private:
-        RefPtrWillBeMember<MediaQueryListListener> m_listener;
-        RefPtrWillBeMember<MediaQueryList> m_query;
-    };
-
-    MediaQueryMatcher(Document*);
-    PassOwnPtr<MediaQueryEvaluator> prepareEvaluator() const;
+    explicit MediaQueryMatcher(Document&);
     AtomicString mediaType() const;
 
+    PassOwnPtr<MediaQueryEvaluator> createEvaluator() const;
+
     Document* m_document;
-    WillBeHeapVector<OwnPtrWillBeMember<Listener> > m_listeners;
+    OwnPtr<MediaQueryEvaluator> m_evaluator;
 
-    // This value is incremented at style selector changes.
-    // It is used to avoid evaluating queries more then once and to make sure
-    // that a media query result change is notified exactly once.
-    unsigned m_evaluationRound;
+    // FIXME: This should a HeapListHashSet.
+    typedef ListHashSet<RawPtrWillBeMember<MediaQueryList> > MediaQueryListSet;
+    MediaQueryListSet m_mediaLists;
 };
 
 }