Make the MediaQueryList listener an EventListener

Source/core/css/MediaQueryList.h

 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this library; see the file COPYING.LIB.  If not, write to
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
 
 #ifndef MediaQueryList_h
 #define MediaQueryList_h
 
 #include "core/dom/ActiveDOMObject.h"
+#include "core/events/EventTarget.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
+class Document;
 class ExecutionContext;
 class MediaQueryListListener;
 class MediaQueryEvaluator;
 class MediaQueryMatcher;
 class MediaQuerySet;
 
 // MediaQueryList interface is specified at http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface
 // The objects of this class are returned by window.matchMedia. They may be used to
 // retrieve the current value of the given media query and to add/remove listeners that
 // will be called whenever the value of the query changes.
 
-class MediaQueryList FINAL : public RefCountedWillBeGarbageCollectedFinalized<MediaQueryList>, public ActiveDOMObject {
+class MediaQueryList FINAL : public RefCountedWillBeGarbageCollectedFinalized<MediaQueryList>, public EventTargetWithInlineData, public ActiveDOMObject {
+#if !ENABLE_OILPAN
+    REFCOUNTED_EVENT_TARGET(MediaQueryList);

[haraken, 2014/07/20 05:14:49]

You can use DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED. Then you don't need
the #if flag.

[cbiesinger, 2014/07/21 22:07:19]

Hm... then I'd have to duplicate the superclass name here. I think I prefer the
#if over the other ugliness.

[haraken, 2014/07/22 01:30:12]

We normally duplicate the superclass name... probably we should invent a better
macro for this (in a follow-up CL).

https://code.google.com/p/chromium/codesearch#search/&q=DEFINE_EVENT_TARGET_R...

+#endif
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaQueryList);
 public:
     static PassRefPtrWillBeRawPtr<MediaQueryList> create(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaQueryMatcher>, PassRefPtrWillBeRawPtr<MediaQuerySet>);
     virtual ~MediaQueryList();
 
     String media() const;
     bool matches();
 
-    void addListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>);
-    void removeListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>);
+    DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
 
-    void mediaFeaturesChanged(WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener> >* listenersToNotify);
+    // These two functions are provided for compatibility with JS code
+    // written before the change listener became a DOM event.
+    void addListener(PassRefPtr<EventListener>);
+    void removeListener(PassRefPtr<EventListener>);

[haraken, 2014/07/20 05:14:49]

Shall we rename these methods to addDeprecatedListener/removeDeprecatedListener?
In an IDL file, you can write:

  [ImplementedAs=addDeprecatedListener] void addListener();

[cbiesinger, 2014/07/21 22:07:19]

That's a great suggestion! Thanks, done.

+
+    void addMediaQueryListListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>);
+    void removeMediaQueryListListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>);
+
+    // Will return true if a DOM event should be scheduled.
+    bool mediaFeaturesChanged(WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener> >* listenersToNotify);
 
     void trace(Visitor*);
 
     // From ActiveDOMObject
     virtual bool hasPendingActivity() const OVERRIDE;
     virtual void stop() OVERRIDE;
 
+    virtual const AtomicString& interfaceName() const OVERRIDE;
+    virtual ExecutionContext* executionContext() const OVERRIDE;
+
 private:
     MediaQueryList(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaQueryMatcher>, PassRefPtrWillBeRawPtr<MediaQuerySet>);
 
     bool updateMatches();
 
     RefPtrWillBeMember<MediaQueryMatcher> m_matcher;
     RefPtrWillBeMember<MediaQuerySet> m_media;
     typedef WillBeHeapListHashSet<RefPtrWillBeMember<MediaQueryListListener> > ListenerList;
     ListenerList m_listeners;
     bool m_matchesDirty;
     bool m_matches;
 };
 
 }
 
 #endif // MediaQueryList_h