Changeset 153551 in webkit
- Timestamp:
- Jul 31, 2013 5:21:33 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r153549 r153551 1 2013-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 1 31 2013-07-31 Tim Horton <timothy_horton@apple.com> 2 32 -
trunk/Source/WebCore/Modules/filesystem/DOMFileSystem.h
r120285 r153551 56 56 57 57 // ActiveDOMObject methods. 58 virtual void stop(); 59 virtual bool hasPendingActivity() const; 60 virtual void contextDestroyed(); 58 virtual bool hasPendingActivity() const OVERRIDE; 61 59 62 60 void createWriter(const FileEntry*, PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback>); … … 76 74 private: 77 75 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; 78 80 79 81 // A helper template to schedule a callback task. -
trunk/Source/WebCore/Modules/filesystem/FileWriter.h
r120728 r153551 69 69 void didFail(FileError::ErrorCode); 70 70 71 // ActiveDOMObject72 virtual bool canSuspend() const;73 virtual void stop();74 75 71 // EventTarget 76 72 virtual const AtomicString& interfaceName() const; … … 98 94 99 95 virtual ~FileWriter(); 96 97 // ActiveDOMObject 98 virtual bool canSuspend() const OVERRIDE; 99 virtual void stop() OVERRIDE; 100 100 101 101 // EventTarget -
trunk/Source/WebCore/Modules/geolocation/Geolocation.h
r142909 r153551 55 55 ~Geolocation(); 56 56 57 virtual void stop() OVERRIDE;58 57 Document* document() const; 59 58 Frame* frame() const; … … 70 69 71 70 private: 71 explicit Geolocation(ScriptExecutionContext*); 72 72 73 Geoposition* lastPosition(); 73 74 75 // ActiveDOMObject 76 virtual void stop() OVERRIDE; 77 74 78 bool isDenied() const { return m_allowGeolocation == No; } 75 76 explicit Geolocation(ScriptExecutionContext*);77 79 78 80 Page* page() const; -
trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h
r146511 r153551 83 83 // ActiveDOMObject 84 84 virtual bool hasPendingActivity() const OVERRIDE; 85 virtual void stop() OVERRIDE;86 85 87 86 // EventTarget … … 112 111 private: 113 112 IDBDatabase(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendInterface>, PassRefPtr<IDBDatabaseCallbacks>); 113 114 // ActiveDOMObject 115 virtual void stop() OVERRIDE; 114 116 115 117 // EventTarget -
trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h
r144820 r153551 97 97 // ActiveDOMObject 98 98 virtual bool hasPendingActivity() const OVERRIDE; 99 virtual void stop() OVERRIDE;100 99 101 100 // EventTarget … … 133 132 134 133 private: 134 // ActiveDOMObject 135 virtual void stop() OVERRIDE; 136 135 137 // EventTarget 136 138 virtual void refEventTarget() { ref(); } -
trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h
r147029 r153551 115 115 // ActiveDOMObject 116 116 virtual bool hasPendingActivity() const OVERRIDE; 117 virtual bool canSuspend() const OVERRIDE;118 virtual void stop() OVERRIDE;119 117 120 118 using RefCounted<IDBTransaction>::ref; … … 129 127 void registerOpenCursor(IDBCursor*); 130 128 void unregisterOpenCursor(IDBCursor*); 129 130 // ActiveDOMObject 131 virtual bool canSuspend() const OVERRIDE; 132 virtual void stop() OVERRIDE; 131 133 132 134 // EventTarget -
trunk/Source/WebCore/Modules/mediasource/MediaSource.h
r146360 r153551 72 72 // ActiveDOMObject interface 73 73 virtual bool hasPendingActivity() const OVERRIDE; 74 virtual void stop() OVERRIDE;75 74 76 75 using RefCounted<MediaSource>::ref; … … 79 78 private: 80 79 explicit MediaSource(ScriptExecutionContext*); 80 81 // ActiveDOMObject interface 82 virtual void stop() OVERRIDE; 81 83 82 84 virtual EventTargetData* eventTargetData() OVERRIDE; -
trunk/Source/WebCore/Modules/notifications/Notification.h
r149334 r153551 126 126 virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); } 127 127 128 // ActiveDOMObject interface129 virtual void contextDestroyed();130 131 128 void stopLoadingIcon(); 132 129 … … 151 148 152 149 void setBody(const String& body) { m_body = body; } 150 151 // ActiveDOMObject interface 152 virtual void contextDestroyed() OVERRIDE; 153 153 154 154 // EventTarget interface -
trunk/Source/WebCore/Modules/notifications/NotificationCenter.h
r147979 r153551 72 72 #endif 73 73 74 virtual void stop() OVERRIDE;75 76 74 private: 77 75 NotificationCenter(ScriptExecutionContext*, NotificationClient*); 76 77 // ActiveDOMObject 78 virtual void stop() OVERRIDE; 78 79 79 80 class NotificationRequestCallback : public RefCounted<NotificationRequestCallback> { -
trunk/Source/WebCore/Modules/websockets/WebSocket.h
r148968 r153551 101 101 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE; 102 102 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 110 103 using RefCounted<WebSocket>::ref; 111 104 using RefCounted<WebSocket>::deref; … … 122 115 private: 123 116 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; 124 124 125 125 virtual void refEventTarget() { ref(); } -
trunk/Source/WebCore/fileapi/FileReader.h
r118253 r153551 77 77 String stringResult(); 78 78 79 // ActiveDOMObject80 virtual bool canSuspend() const;81 virtual void stop();82 83 79 // EventTarget 84 80 virtual const AtomicString& interfaceName() const; … … 103 99 private: 104 100 FileReader(ScriptExecutionContext*); 101 102 // ActiveDOMObject 103 virtual bool canSuspend() const OVERRIDE; 104 virtual void stop() OVERRIDE; 105 105 106 106 // EventTarget -
trunk/Source/WebCore/html/HTMLMediaElement.h
r153448 r153551 445 445 446 446 // 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; 451 451 452 452 virtual void mediaVolumeDidChange(); -
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h
r152351 r153551 322 322 unsigned getMaxVertexAttribs() const { return m_maxVertexAttribs; } 323 323 324 // ActiveDOMObject notifications 325 virtual bool hasPendingActivity() const; 326 virtual void stop(); 327 328 private: 324 private: 329 325 friend class EXTDrawBuffers; 330 326 friend class WebGLFramebuffer; … … 341 337 void initializeNewContext(); 342 338 void setupFlags(); 339 340 // ActiveDOMObject 341 virtual bool hasPendingActivity() const OVERRIDE; 342 virtual void stop() OVERRIDE; 343 343 344 344 void addSharedObject(WebGLSharedObject*); -
trunk/Source/WebCore/page/DOMTimer.h
r153406 r153551 44 44 static void removeById(ScriptExecutionContext*, int timeoutId); 45 45 46 // ActiveDOMObject47 virtual void contextDestroyed() OVERRIDE;48 49 46 // Adjust to a change in the ScriptExecutionContext's minimum timer interval. 50 47 // This allows the minimum allowable interval time to be changed in response … … 55 52 DOMTimer(ScriptExecutionContext*, PassOwnPtr<ScheduledAction>, int interval, bool singleShot); 56 53 virtual void fired() OVERRIDE; 54 55 // ActiveDOMObject 56 virtual void contextDestroyed() OVERRIDE; 57 57 58 58 // SuspendableTimer -
trunk/Source/WebCore/page/EventSource.h
r149098 r153551 79 79 virtual ScriptExecutionContext* scriptExecutionContext() const; 80 80 81 virtual void stop();82 83 81 private: 84 82 EventSource(ScriptExecutionContext*, const KURL&, const Dictionary&); … … 95 93 virtual void didFailAccessControlCheck(const ResourceError&); 96 94 virtual void didFailRedirectCheck(); 95 96 virtual void stop() OVERRIDE; 97 97 98 98 void connect(); -
trunk/Source/WebCore/page/SuspendableTimer.h
r153406 r153551 38 38 virtual ~SuspendableTimer(); 39 39 40 // ActiveDOMObject41 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 47 40 // A hook for derived classes to perform cleanup. 48 41 virtual void didStop(); … … 65 58 virtual void fired() = 0; 66 59 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 67 67 bool m_suspended; 68 68 -
trunk/Source/WebCore/workers/AbstractWorker.h
r145930 r153551 58 58 using RefCounted<AbstractWorker>::deref; 59 59 60 virtual void contextDestroyed() OVERRIDE;61 60 AbstractWorker(ScriptExecutionContext*); 62 61 virtual ~AbstractWorker(); … … 73 72 virtual EventTargetData* ensureEventTargetData() OVERRIDE; 74 73 74 virtual void contextDestroyed() OVERRIDE; 75 75 76 EventTargetData m_eventTargetData; 76 77 }; -
trunk/Source/WebCore/xml/XMLHttpRequest.h
r149853 r153551 70 70 }; 71 71 72 virtual void contextDestroyed();73 72 #if ENABLE(XHR_TIMEOUT) 74 73 virtual void didTimeout(); 75 74 #endif 76 virtual bool canSuspend() const;77 virtual void suspend(ReasonForSuspension);78 virtual void resume();79 virtual void stop();80 75 81 76 virtual const AtomicString& interfaceName() const; … … 152 147 XMLHttpRequest(ScriptExecutionContext*); 153 148 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 154 156 virtual void refEventTarget() { ref(); } 155 157 virtual void derefEventTarget() { deref(); }
Note: See TracChangeset
for help on using the changeset viewer.