Changeset 153551 in webkit


Ignore:
Timestamp:
Jul 31, 2013 5:21:33 PM (11 years ago)
Author:
ap@apple.com
Message:

Make ActiveDOMObject overrides private
https://bugs.webkit.org/show_bug.cgi?id=119352

Reviewed by Sam Weinig.

There is no need to call these through derived classes. And it's quite harmful for
anyone except for ScriptExecutionContext to call suspend/resume in particular -
ScriptExecutionContext won't know, and it will try to manage the state on its own.

  • Modules/filesystem/DOMFileSystem.h:
  • Modules/filesystem/FileWriter.h:
  • Modules/geolocation/Geolocation.h:
  • Modules/indexeddb/IDBDatabase.h:
  • Modules/indexeddb/IDBRequest.h:
  • Modules/indexeddb/IDBTransaction.h:
  • Modules/mediasource/MediaSource.h:
  • Modules/notifications/Notification.h:
  • Modules/notifications/NotificationCenter.h:
  • Modules/websockets/WebSocket.h:
  • fileapi/FileReader.h:
  • html/HTMLMediaElement.h:
  • html/canvas/WebGLRenderingContext.h:
  • page/DOMTimer.h:
  • page/EventSource.h:
  • page/SuspendableTimer.h:
  • workers/AbstractWorker.h:
  • xml/XMLHttpRequest.h:
Location:
trunk/Source/WebCore
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r153549 r153551  
     12013-07-31  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Make ActiveDOMObject overrides private
     4        https://bugs.webkit.org/show_bug.cgi?id=119352
     5
     6        Reviewed by Sam Weinig.
     7
     8        There is no need to call these through derived classes. And it's quite harmful for
     9        anyone except for ScriptExecutionContext to call suspend/resume in particular -
     10        ScriptExecutionContext won't know, and it will try to manage the state on its own.
     11
     12        * Modules/filesystem/DOMFileSystem.h:
     13        * Modules/filesystem/FileWriter.h:
     14        * Modules/geolocation/Geolocation.h:
     15        * Modules/indexeddb/IDBDatabase.h:
     16        * Modules/indexeddb/IDBRequest.h:
     17        * Modules/indexeddb/IDBTransaction.h:
     18        * Modules/mediasource/MediaSource.h:
     19        * Modules/notifications/Notification.h:
     20        * Modules/notifications/NotificationCenter.h:
     21        * Modules/websockets/WebSocket.h:
     22        * fileapi/FileReader.h:
     23        * html/HTMLMediaElement.h:
     24        * html/canvas/WebGLRenderingContext.h:
     25        * page/DOMTimer.h:
     26        * page/EventSource.h:
     27        * page/SuspendableTimer.h:
     28        * workers/AbstractWorker.h:
     29        * xml/XMLHttpRequest.h:
     30
    1312013-07-31  Tim Horton  <timothy_horton@apple.com>
    232
  • trunk/Source/WebCore/Modules/filesystem/DOMFileSystem.h

    r120285 r153551  
    5656
    5757    // ActiveDOMObject methods.
    58     virtual void stop();
    59     virtual bool hasPendingActivity() const;
    60     virtual void contextDestroyed();
     58    virtual bool hasPendingActivity() const OVERRIDE;
    6159
    6260    void createWriter(const FileEntry*, PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback>);
     
    7674private:
    7775    DOMFileSystem(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
     76
     77    // ActiveDOMObject methods.
     78    virtual void stop() OVERRIDE;
     79    virtual void contextDestroyed() OVERRIDE;
    7880
    7981    // A helper template to schedule a callback task.
  • trunk/Source/WebCore/Modules/filesystem/FileWriter.h

    r120728 r153551  
    6969    void didFail(FileError::ErrorCode);
    7070
    71     // ActiveDOMObject
    72     virtual bool canSuspend() const;
    73     virtual void stop();
    74 
    7571    // EventTarget
    7672    virtual const AtomicString& interfaceName() const;
     
    9894
    9995    virtual ~FileWriter();
     96
     97    // ActiveDOMObject
     98    virtual bool canSuspend() const OVERRIDE;
     99    virtual void stop() OVERRIDE;
    100100
    101101    // EventTarget
  • trunk/Source/WebCore/Modules/geolocation/Geolocation.h

    r142909 r153551  
    5555    ~Geolocation();
    5656
    57     virtual void stop() OVERRIDE;
    5857    Document* document() const;
    5958    Frame* frame() const;
     
    7069
    7170private:
     71    explicit Geolocation(ScriptExecutionContext*);
     72
    7273    Geoposition* lastPosition();
    7374
     75    // ActiveDOMObject
     76    virtual void stop() OVERRIDE;
     77
    7478    bool isDenied() const { return m_allowGeolocation == No; }
    75 
    76     explicit Geolocation(ScriptExecutionContext*);
    7779
    7880    Page* page() const;
  • trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h

    r146511 r153551  
    8383    // ActiveDOMObject
    8484    virtual bool hasPendingActivity() const OVERRIDE;
    85     virtual void stop() OVERRIDE;
    8685
    8786    // EventTarget
     
    112111private:
    113112    IDBDatabase(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendInterface>, PassRefPtr<IDBDatabaseCallbacks>);
     113
     114    // ActiveDOMObject
     115    virtual void stop() OVERRIDE;
    114116
    115117    // EventTarget
  • trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h

    r144820 r153551  
    9797    // ActiveDOMObject
    9898    virtual bool hasPendingActivity() const OVERRIDE;
    99     virtual void stop() OVERRIDE;
    10099
    101100    // EventTarget
     
    133132
    134133private:
     134    // ActiveDOMObject
     135    virtual void stop() OVERRIDE;
     136
    135137    // EventTarget
    136138    virtual void refEventTarget() { ref(); }
  • trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h

    r147029 r153551  
    115115    // ActiveDOMObject
    116116    virtual bool hasPendingActivity() const OVERRIDE;
    117     virtual bool canSuspend() const OVERRIDE;
    118     virtual void stop() OVERRIDE;
    119117
    120118    using RefCounted<IDBTransaction>::ref;
     
    129127    void registerOpenCursor(IDBCursor*);
    130128    void unregisterOpenCursor(IDBCursor*);
     129
     130    // ActiveDOMObject
     131    virtual bool canSuspend() const OVERRIDE;
     132    virtual void stop() OVERRIDE;
    131133
    132134    // EventTarget
  • trunk/Source/WebCore/Modules/mediasource/MediaSource.h

    r146360 r153551  
    7272    // ActiveDOMObject interface
    7373    virtual bool hasPendingActivity() const OVERRIDE;
    74     virtual void stop() OVERRIDE;
    7574
    7675    using RefCounted<MediaSource>::ref;
     
    7978private:
    8079    explicit MediaSource(ScriptExecutionContext*);
     80
     81    // ActiveDOMObject interface
     82    virtual void stop() OVERRIDE;
    8183
    8284    virtual EventTargetData* eventTargetData() OVERRIDE;
  • trunk/Source/WebCore/Modules/notifications/Notification.h

    r149334 r153551  
    126126    virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); }
    127127
    128     // ActiveDOMObject interface
    129     virtual void contextDestroyed();
    130 
    131128    void stopLoadingIcon();
    132129
     
    151148
    152149    void setBody(const String& body) { m_body = body; }
     150
     151    // ActiveDOMObject interface
     152    virtual void contextDestroyed() OVERRIDE;
    153153
    154154    // EventTarget interface
  • trunk/Source/WebCore/Modules/notifications/NotificationCenter.h

    r147979 r153551  
    7272#endif
    7373
    74     virtual void stop() OVERRIDE;
    75 
    7674private:
    7775    NotificationCenter(ScriptExecutionContext*, NotificationClient*);
     76
     77    // ActiveDOMObject
     78    virtual void stop() OVERRIDE;
    7879
    7980    class NotificationRequestCallback : public RefCounted<NotificationRequestCallback> {
  • trunk/Source/WebCore/Modules/websockets/WebSocket.h

    r148968 r153551  
    101101    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    102102
    103     // ActiveDOMObject functions.
    104     virtual void contextDestroyed() OVERRIDE;
    105     virtual bool canSuspend() const OVERRIDE;
    106     virtual void suspend(ReasonForSuspension) OVERRIDE;
    107     virtual void resume() OVERRIDE;
    108     virtual void stop() OVERRIDE;
    109 
    110103    using RefCounted<WebSocket>::ref;
    111104    using RefCounted<WebSocket>::deref;
     
    122115private:
    123116    explicit WebSocket(ScriptExecutionContext*);
     117
     118    // ActiveDOMObject functions.
     119    virtual void contextDestroyed() OVERRIDE;
     120    virtual bool canSuspend() const OVERRIDE;
     121    virtual void suspend(ReasonForSuspension) OVERRIDE;
     122    virtual void resume() OVERRIDE;
     123    virtual void stop() OVERRIDE;
    124124
    125125    virtual void refEventTarget() { ref(); }
  • trunk/Source/WebCore/fileapi/FileReader.h

    r118253 r153551  
    7777    String stringResult();
    7878
    79     // ActiveDOMObject
    80     virtual bool canSuspend() const;
    81     virtual void stop();
    82 
    8379    // EventTarget
    8480    virtual const AtomicString& interfaceName() const;
     
    10399private:
    104100    FileReader(ScriptExecutionContext*);
     101
     102    // ActiveDOMObject
     103    virtual bool canSuspend() const OVERRIDE;
     104    virtual void stop() OVERRIDE;
    105105
    106106    // EventTarget
  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r153448 r153551  
    445445
    446446    // ActiveDOMObject functions.
    447     virtual bool canSuspend() const;
    448     virtual void suspend(ReasonForSuspension);
    449     virtual void resume();
    450     virtual void stop();
     447    virtual bool canSuspend() const OVERRIDE;
     448    virtual void suspend(ReasonForSuspension) OVERRIDE;
     449    virtual void resume() OVERRIDE;
     450    virtual void stop() OVERRIDE;
    451451   
    452452    virtual void mediaVolumeDidChange();
  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h

    r152351 r153551  
    322322    unsigned getMaxVertexAttribs() const { return m_maxVertexAttribs; }
    323323
    324     // ActiveDOMObject notifications
    325     virtual bool hasPendingActivity() const;
    326     virtual void stop();
    327 
    328   private:
     324private:
    329325    friend class EXTDrawBuffers;
    330326    friend class WebGLFramebuffer;
     
    341337    void initializeNewContext();
    342338    void setupFlags();
     339
     340    // ActiveDOMObject
     341    virtual bool hasPendingActivity() const OVERRIDE;
     342    virtual void stop() OVERRIDE;
    343343
    344344    void addSharedObject(WebGLSharedObject*);
  • trunk/Source/WebCore/page/DOMTimer.h

    r153406 r153551  
    4444        static void removeById(ScriptExecutionContext*, int timeoutId);
    4545
    46         // ActiveDOMObject
    47         virtual void contextDestroyed() OVERRIDE;
    48 
    4946        // Adjust to a change in the ScriptExecutionContext's minimum timer interval.
    5047        // This allows the minimum allowable interval time to be changed in response
     
    5552        DOMTimer(ScriptExecutionContext*, PassOwnPtr<ScheduledAction>, int interval, bool singleShot);
    5653        virtual void fired() OVERRIDE;
     54
     55        // ActiveDOMObject
     56        virtual void contextDestroyed() OVERRIDE;
    5757
    5858        // SuspendableTimer
  • trunk/Source/WebCore/page/EventSource.h

    r149098 r153551  
    7979    virtual ScriptExecutionContext* scriptExecutionContext() const;
    8080
    81     virtual void stop();
    82 
    8381private:
    8482    EventSource(ScriptExecutionContext*, const KURL&, const Dictionary&);
     
    9593    virtual void didFailAccessControlCheck(const ResourceError&);
    9694    virtual void didFailRedirectCheck();
     95
     96    virtual void stop() OVERRIDE;
    9797
    9898    void connect();
  • trunk/Source/WebCore/page/SuspendableTimer.h

    r153406 r153551  
    3838    virtual ~SuspendableTimer();
    3939
    40     // ActiveDOMObject
    41     virtual bool hasPendingActivity() const FINAL OVERRIDE;
    42     virtual void stop() FINAL OVERRIDE;
    43     virtual bool canSuspend() const FINAL OVERRIDE;
    44     virtual void suspend(ReasonForSuspension) FINAL OVERRIDE;
    45     virtual void resume() FINAL OVERRIDE;
    46 
    4740    // A hook for derived classes to perform cleanup.
    4841    virtual void didStop();
     
    6558    virtual void fired() = 0;
    6659
     60    // ActiveDOMObject
     61    virtual bool hasPendingActivity() const FINAL OVERRIDE;
     62    virtual void stop() FINAL OVERRIDE;
     63    virtual bool canSuspend() const FINAL OVERRIDE;
     64    virtual void suspend(ReasonForSuspension) FINAL OVERRIDE;
     65    virtual void resume() FINAL OVERRIDE;
     66
    6767    bool m_suspended;
    6868
  • trunk/Source/WebCore/workers/AbstractWorker.h

    r145930 r153551  
    5858        using RefCounted<AbstractWorker>::deref;
    5959
    60         virtual void contextDestroyed() OVERRIDE;
    6160        AbstractWorker(ScriptExecutionContext*);
    6261        virtual ~AbstractWorker();
     
    7372        virtual EventTargetData* ensureEventTargetData() OVERRIDE;
    7473       
     74        virtual void contextDestroyed() OVERRIDE;
     75
    7576        EventTargetData m_eventTargetData;
    7677    };
  • trunk/Source/WebCore/xml/XMLHttpRequest.h

    r149853 r153551  
    7070    };
    7171
    72     virtual void contextDestroyed();
    7372#if ENABLE(XHR_TIMEOUT)
    7473    virtual void didTimeout();
    7574#endif
    76     virtual bool canSuspend() const;
    77     virtual void suspend(ReasonForSuspension);
    78     virtual void resume();
    79     virtual void stop();
    8075
    8176    virtual const AtomicString& interfaceName() const;
     
    152147    XMLHttpRequest(ScriptExecutionContext*);
    153148
     149    // ActiveDOMObject
     150    virtual void contextDestroyed() OVERRIDE;
     151    virtual bool canSuspend() const OVERRIDE;
     152    virtual void suspend(ReasonForSuspension) OVERRIDE;
     153    virtual void resume() OVERRIDE;
     154    virtual void stop() OVERRIDE;
     155
    154156    virtual void refEventTarget() { ref(); }
    155157    virtual void derefEventTarget() { deref(); }
Note: See TracChangeset for help on using the changeset viewer.