Changeset 192848 in webkit


Ignore:
Timestamp:
Nov 30, 2015 5:55:43 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Rename ActiveDOMObject/DOMWindow PageCacheSuspension code to support more reasons for suspension
​https://bugs.webkit.org/show_bug.cgi?id=151677

Patch by Katlyn Graff <​kgraff@apple.com> on 2015-11-30
Reviewed by Ryosuke Niwa.

Source/WebCore:

Simply a refactoring patch, so no new tests.

  • Modules/encryptedmedia/MediaKeySession.cpp:

(WebCore::MediaKeySession::canSuspendForDocumentSuspension):
(WebCore::MediaKeySession::canSuspendForPageCache): Deleted.

  • Modules/encryptedmedia/MediaKeySession.h:
  • Modules/geolocation/Geolocation.cpp:

(WebCore::Geolocation::canSuspendForDocumentSuspension):
(WebCore::Geolocation::canSuspendForPageCache): Deleted.

  • Modules/geolocation/Geolocation.h:
  • Modules/indexeddb/DOMWindowIndexedDatabase.cpp:

(WebCore::DOMWindowIndexedDatabase::disconnectFrameForDocumentSuspension):
(WebCore::DOMWindowIndexedDatabase::reconnectFrameFromDocumentSuspension):
(WebCore::DOMWindowIndexedDatabase::disconnectFrameForPageCache): Deleted.
(WebCore::DOMWindowIndexedDatabase::reconnectFrameFromPageCache): Deleted.

  • Modules/indexeddb/DOMWindowIndexedDatabase.h:
  • Modules/indexeddb/client/IDBDatabaseImpl.cpp:

(WebCore::IDBClient::IDBDatabase::canSuspendForDocumentSuspension):
(WebCore::IDBClient::IDBDatabase::canSuspendForPageCache): Deleted.

  • Modules/indexeddb/client/IDBDatabaseImpl.h:
  • Modules/indexeddb/client/IDBRequestImpl.cpp:

(WebCore::IDBClient::IDBRequest::canSuspendForDocumentSuspension):
(WebCore::IDBClient::IDBRequest::canSuspendForPageCache): Deleted.

  • Modules/indexeddb/client/IDBRequestImpl.h:
  • Modules/indexeddb/client/IDBTransactionImpl.cpp:

(WebCore::IDBClient::IDBTransaction::canSuspendForDocumentSuspension):
(WebCore::IDBClient::IDBTransaction::canSuspendForPageCache): Deleted.

  • Modules/indexeddb/client/IDBTransactionImpl.h:
  • Modules/indexeddb/legacy/LegacyDatabase.cpp:

(WebCore::LegacyDatabase::canSuspendForDocumentSuspension):
(WebCore::LegacyDatabase::canSuspendForPageCache): Deleted.

  • Modules/indexeddb/legacy/LegacyDatabase.h:
  • Modules/indexeddb/legacy/LegacyRequest.cpp:

(WebCore::LegacyRequest::canSuspendForDocumentSuspension):
(WebCore::LegacyRequest::canSuspendForPageCache): Deleted.

  • Modules/indexeddb/legacy/LegacyRequest.h:
  • Modules/indexeddb/legacy/LegacyTransaction.cpp:

(WebCore::LegacyTransaction::canSuspendForDocumentSuspension):
(WebCore::LegacyTransaction::canSuspendForPageCache): Deleted.

  • Modules/indexeddb/legacy/LegacyTransaction.h:
  • Modules/mediasource/MediaSource.cpp:

(WebCore::MediaSource::canSuspendForDocumentSuspension):
(WebCore::MediaSource::canSuspendForPageCache): Deleted.

  • Modules/mediasource/MediaSource.h:
  • Modules/mediasource/SourceBuffer.cpp:

(WebCore::SourceBuffer::canSuspendForDocumentSuspension):
(WebCore::SourceBuffer::canSuspendForPageCache): Deleted.

  • Modules/mediasource/SourceBuffer.h:
  • Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::canSuspendForDocumentSuspension):
(WebCore::MediaStreamTrack::canSuspendForPageCache): Deleted.

  • Modules/mediastream/MediaStreamTrack.h:
  • Modules/mediastream/RTCDTMFSender.cpp:

(WebCore::RTCDTMFSender::canSuspendForDocumentSuspension):
(WebCore::RTCDTMFSender::canSuspendForPageCache): Deleted.

  • Modules/mediastream/RTCDTMFSender.h:
  • Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::canSuspendForDocumentSuspension):
(WebCore::RTCPeerConnection::canSuspendForPageCache): Deleted.

  • Modules/mediastream/RTCPeerConnection.h:
  • Modules/notifications/DOMWindowNotifications.cpp:

(WebCore::DOMWindowNotifications::disconnectFrameForDocumentSuspension):
(WebCore::DOMWindowNotifications::reconnectFrameFromDocumentSuspension):
(WebCore::DOMWindowNotifications::disconnectFrameForPageCache): Deleted.
(WebCore::DOMWindowNotifications::reconnectFrameFromPageCache): Deleted.

  • Modules/notifications/DOMWindowNotifications.h:
  • Modules/notifications/Notification.cpp:

(WebCore::Notification::canSuspendForDocumentSuspension):
(WebCore::Notification::canSuspendForPageCache): Deleted.

  • Modules/notifications/Notification.h:
  • Modules/notifications/NotificationCenter.cpp:

(WebCore::NotificationCenter::canSuspendForDocumentSuspension):
(WebCore::NotificationCenter::canSuspendForPageCache): Deleted.

  • Modules/notifications/NotificationCenter.h:
  • Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::canSuspendForDocumentSuspension):
(WebCore::AudioContext::canSuspendForPageCache): Deleted.

  • Modules/webaudio/AudioContext.h:
  • Modules/webdatabase/DatabaseContext.cpp:

(WebCore::DatabaseContext::canSuspendForDocumentSuspension):
(WebCore::DatabaseContext::canSuspendForPageCache): Deleted.

  • Modules/webdatabase/DatabaseContext.h:
  • Modules/websockets/WebSocket.cpp:

(WebCore::WebSocket::canSuspendForDocumentSuspension):
(WebCore::WebSocket::canSuspendForPageCache): Deleted.

  • Modules/websockets/WebSocket.h:
  • css/FontLoader.cpp:

(WebCore::FontLoader::canSuspendForDocumentSuspension):
(WebCore::FontLoader::canSuspendForPageCache): Deleted.

  • css/FontLoader.h:
  • dom/ActiveDOMObject.cpp:

(WebCore::ActiveDOMObject::canSuspendForDocumentSuspension):
(WebCore::ActiveDOMObject::canSuspendForPageCache): Deleted.

  • dom/ActiveDOMObject.h:
  • dom/Document.cpp:

(WebCore::Document::~Document):

  • dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForTabSuspension):
(WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache): Deleted.

  • dom/ScriptExecutionContext.h:
  • fileapi/FileReader.cpp:

(WebCore::FileReader::canSuspendForDocumentSuspension):
(WebCore::FileReader::canSuspendForPageCache): Deleted.

  • fileapi/FileReader.h:
  • history/CachedFrame.cpp:

(WebCore::CachedFrame::CachedFrame):

  • history/PageCache.cpp:

(WebCore::canCacheFrame):

  • html/HTMLMarqueeElement.cpp:

(WebCore::HTMLMarqueeElement::canSuspendForDocumentSuspension):
(WebCore::HTMLMarqueeElement::canSuspendForPageCache): Deleted.

  • html/HTMLMarqueeElement.h:
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::canSuspendForDocumentSuspension):
(WebCore::HTMLMediaElement::canSuspendForPageCache): Deleted.

  • html/HTMLMediaElement.h:
  • html/HTMLSourceElement.cpp:

(WebCore::HTMLSourceElement::canSuspendForDocumentSuspension):
(WebCore::HTMLSourceElement::canSuspendForPageCache): Deleted.

  • html/HTMLSourceElement.h:
  • html/PublicURLManager.cpp:

(WebCore::PublicURLManager::canSuspendForDocumentSuspension):
(WebCore::PublicURLManager::canSuspendForPageCache): Deleted.

  • html/PublicURLManager.h:
  • html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::canSuspendForDocumentSuspension):
(WebCore::WebGLRenderingContextBase::canSuspendForPageCache): Deleted.

  • html/canvas/WebGLRenderingContextBase.h:
  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::clear):
(WebCore::FrameLoader::open):

  • loader/appcache/DOMApplicationCache.cpp:

(WebCore::DOMApplicationCache::disconnectFrameForDocumentSuspension):
(WebCore::DOMApplicationCache::reconnectFrameFromDocumentSuspension):
(WebCore::DOMApplicationCache::disconnectFrameForPageCache): Deleted.
(WebCore::DOMApplicationCache::reconnectFrameFromPageCache): Deleted.

  • loader/appcache/DOMApplicationCache.h:
  • page/DOMWindow.cpp:

(WebCore::DOMWindow::DOMWindow):
(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::resetUnlessSuspendedForDocumentSuspension):
(WebCore::DOMWindow::suspendForDocumentSuspension):
(WebCore::DOMWindow::resumeFromDocumentSuspension):
(WebCore::DOMWindow::disconnectDOMWindowProperties):
(WebCore::DOMWindow::reconnectDOMWindowProperties):
(WebCore::DOMWindow::resetUnlessSuspendedForPageCache): Deleted.
(WebCore::DOMWindow::suspendForPageCache): Deleted.
(WebCore::DOMWindow::resumeFromPageCache): Deleted.

  • page/DOMWindow.h:
  • page/DOMWindowExtension.cpp:

(WebCore::DOMWindowExtension::disconnectFrameForDocumentSuspension):
(WebCore::DOMWindowExtension::reconnectFrameFromDocumentSuspension):
(WebCore::DOMWindowExtension::disconnectFrameForPageCache): Deleted.
(WebCore::DOMWindowExtension::reconnectFrameFromPageCache): Deleted.

  • page/DOMWindowExtension.h:
  • page/DOMWindowProperty.cpp:

(WebCore::DOMWindowProperty::disconnectFrameForDocumentSuspension):
(WebCore::DOMWindowProperty::reconnectFrameFromDocumentSuspension):
(WebCore::DOMWindowProperty::disconnectFrameForPageCache): Deleted.
(WebCore::DOMWindowProperty::reconnectFrameFromPageCache): Deleted.

  • page/DOMWindowProperty.h:
  • page/EventSource.cpp:

(WebCore::EventSource::canSuspendForDocumentSuspension):
(WebCore::EventSource::canSuspendForPageCache): Deleted.

  • page/EventSource.h:
  • page/SuspendableTimer.cpp:

(WebCore::SuspendableTimer::canSuspendForDocumentSuspension):
(WebCore::SuspendableTimer::canSuspendForPageCache): Deleted.

  • page/SuspendableTimer.h:
  • workers/Worker.cpp:

(WebCore::Worker::canSuspendForDocumentSuspension):
(WebCore::Worker::canSuspendForPageCache): Deleted.

  • workers/Worker.h:
  • xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::canSuspendForDocumentSuspension):
(WebCore::XMLHttpRequest::canSuspendForPageCache): Deleted.

  • xml/XMLHttpRequest.h:

Source/WebKit/mac:

  • WebView/WebFrame.mm:

(-[WebFrame _cacheabilityDictionary]):

Location:
trunk/Source
Files:
81 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r192847 r192848  
     12015-11-30  Katlyn Graff  <kgraff@apple.com>
     2
     3        Rename ActiveDOMObject/DOMWindow PageCacheSuspension code to support more reasons for suspension
     4        https://bugs.webkit.org/show_bug.cgi?id=151677
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Simply a refactoring patch, so no new tests.
     9
     10        * Modules/encryptedmedia/MediaKeySession.cpp:
     11        (WebCore::MediaKeySession::canSuspendForDocumentSuspension):
     12        (WebCore::MediaKeySession::canSuspendForPageCache): Deleted.
     13        * Modules/encryptedmedia/MediaKeySession.h:
     14        * Modules/geolocation/Geolocation.cpp:
     15        (WebCore::Geolocation::canSuspendForDocumentSuspension):
     16        (WebCore::Geolocation::canSuspendForPageCache): Deleted.
     17        * Modules/geolocation/Geolocation.h:
     18        * Modules/indexeddb/DOMWindowIndexedDatabase.cpp:
     19        (WebCore::DOMWindowIndexedDatabase::disconnectFrameForDocumentSuspension):
     20        (WebCore::DOMWindowIndexedDatabase::reconnectFrameFromDocumentSuspension):
     21        (WebCore::DOMWindowIndexedDatabase::disconnectFrameForPageCache): Deleted.
     22        (WebCore::DOMWindowIndexedDatabase::reconnectFrameFromPageCache): Deleted.
     23        * Modules/indexeddb/DOMWindowIndexedDatabase.h:
     24        * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
     25        (WebCore::IDBClient::IDBDatabase::canSuspendForDocumentSuspension):
     26        (WebCore::IDBClient::IDBDatabase::canSuspendForPageCache): Deleted.
     27        * Modules/indexeddb/client/IDBDatabaseImpl.h:
     28        * Modules/indexeddb/client/IDBRequestImpl.cpp:
     29        (WebCore::IDBClient::IDBRequest::canSuspendForDocumentSuspension):
     30        (WebCore::IDBClient::IDBRequest::canSuspendForPageCache): Deleted.
     31        * Modules/indexeddb/client/IDBRequestImpl.h:
     32        * Modules/indexeddb/client/IDBTransactionImpl.cpp:
     33        (WebCore::IDBClient::IDBTransaction::canSuspendForDocumentSuspension):
     34        (WebCore::IDBClient::IDBTransaction::canSuspendForPageCache): Deleted.
     35        * Modules/indexeddb/client/IDBTransactionImpl.h:
     36        * Modules/indexeddb/legacy/LegacyDatabase.cpp:
     37        (WebCore::LegacyDatabase::canSuspendForDocumentSuspension):
     38        (WebCore::LegacyDatabase::canSuspendForPageCache): Deleted.
     39        * Modules/indexeddb/legacy/LegacyDatabase.h:
     40        * Modules/indexeddb/legacy/LegacyRequest.cpp:
     41        (WebCore::LegacyRequest::canSuspendForDocumentSuspension):
     42        (WebCore::LegacyRequest::canSuspendForPageCache): Deleted.
     43        * Modules/indexeddb/legacy/LegacyRequest.h:
     44        * Modules/indexeddb/legacy/LegacyTransaction.cpp:
     45        (WebCore::LegacyTransaction::canSuspendForDocumentSuspension):
     46        (WebCore::LegacyTransaction::canSuspendForPageCache): Deleted.
     47        * Modules/indexeddb/legacy/LegacyTransaction.h:
     48        * Modules/mediasource/MediaSource.cpp:
     49        (WebCore::MediaSource::canSuspendForDocumentSuspension):
     50        (WebCore::MediaSource::canSuspendForPageCache): Deleted.
     51        * Modules/mediasource/MediaSource.h:
     52        * Modules/mediasource/SourceBuffer.cpp:
     53        (WebCore::SourceBuffer::canSuspendForDocumentSuspension):
     54        (WebCore::SourceBuffer::canSuspendForPageCache): Deleted.
     55        * Modules/mediasource/SourceBuffer.h:
     56        * Modules/mediastream/MediaStreamTrack.cpp:
     57        (WebCore::MediaStreamTrack::canSuspendForDocumentSuspension):
     58        (WebCore::MediaStreamTrack::canSuspendForPageCache): Deleted.
     59        * Modules/mediastream/MediaStreamTrack.h:
     60        * Modules/mediastream/RTCDTMFSender.cpp:
     61        (WebCore::RTCDTMFSender::canSuspendForDocumentSuspension):
     62        (WebCore::RTCDTMFSender::canSuspendForPageCache): Deleted.
     63        * Modules/mediastream/RTCDTMFSender.h:
     64        * Modules/mediastream/RTCPeerConnection.cpp:
     65        (WebCore::RTCPeerConnection::canSuspendForDocumentSuspension):
     66        (WebCore::RTCPeerConnection::canSuspendForPageCache): Deleted.
     67        * Modules/mediastream/RTCPeerConnection.h:
     68        * Modules/notifications/DOMWindowNotifications.cpp:
     69        (WebCore::DOMWindowNotifications::disconnectFrameForDocumentSuspension):
     70        (WebCore::DOMWindowNotifications::reconnectFrameFromDocumentSuspension):
     71        (WebCore::DOMWindowNotifications::disconnectFrameForPageCache): Deleted.
     72        (WebCore::DOMWindowNotifications::reconnectFrameFromPageCache): Deleted.
     73        * Modules/notifications/DOMWindowNotifications.h:
     74        * Modules/notifications/Notification.cpp:
     75        (WebCore::Notification::canSuspendForDocumentSuspension):
     76        (WebCore::Notification::canSuspendForPageCache): Deleted.
     77        * Modules/notifications/Notification.h:
     78        * Modules/notifications/NotificationCenter.cpp:
     79        (WebCore::NotificationCenter::canSuspendForDocumentSuspension):
     80        (WebCore::NotificationCenter::canSuspendForPageCache): Deleted.
     81        * Modules/notifications/NotificationCenter.h:
     82        * Modules/webaudio/AudioContext.cpp:
     83        (WebCore::AudioContext::canSuspendForDocumentSuspension):
     84        (WebCore::AudioContext::canSuspendForPageCache): Deleted.
     85        * Modules/webaudio/AudioContext.h:
     86        * Modules/webdatabase/DatabaseContext.cpp:
     87        (WebCore::DatabaseContext::canSuspendForDocumentSuspension):
     88        (WebCore::DatabaseContext::canSuspendForPageCache): Deleted.
     89        * Modules/webdatabase/DatabaseContext.h:
     90        * Modules/websockets/WebSocket.cpp:
     91        (WebCore::WebSocket::canSuspendForDocumentSuspension):
     92        (WebCore::WebSocket::canSuspendForPageCache): Deleted.
     93        * Modules/websockets/WebSocket.h:
     94        * css/FontLoader.cpp:
     95        (WebCore::FontLoader::canSuspendForDocumentSuspension):
     96        (WebCore::FontLoader::canSuspendForPageCache): Deleted.
     97        * css/FontLoader.h:
     98        * dom/ActiveDOMObject.cpp:
     99        (WebCore::ActiveDOMObject::canSuspendForDocumentSuspension):
     100        (WebCore::ActiveDOMObject::canSuspendForPageCache): Deleted.
     101        * dom/ActiveDOMObject.h:
     102        * dom/Document.cpp:
     103        (WebCore::Document::~Document):
     104        * dom/ScriptExecutionContext.cpp:
     105        (WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForTabSuspension):
     106        (WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache): Deleted.
     107        * dom/ScriptExecutionContext.h:
     108        * fileapi/FileReader.cpp:
     109        (WebCore::FileReader::canSuspendForDocumentSuspension):
     110        (WebCore::FileReader::canSuspendForPageCache): Deleted.
     111        * fileapi/FileReader.h:
     112        * history/CachedFrame.cpp:
     113        (WebCore::CachedFrame::CachedFrame):
     114        * history/PageCache.cpp:
     115        (WebCore::canCacheFrame):
     116        * html/HTMLMarqueeElement.cpp:
     117        (WebCore::HTMLMarqueeElement::canSuspendForDocumentSuspension):
     118        (WebCore::HTMLMarqueeElement::canSuspendForPageCache): Deleted.
     119        * html/HTMLMarqueeElement.h:
     120        * html/HTMLMediaElement.cpp:
     121        (WebCore::HTMLMediaElement::canSuspendForDocumentSuspension):
     122        (WebCore::HTMLMediaElement::canSuspendForPageCache): Deleted.
     123        * html/HTMLMediaElement.h:
     124        * html/HTMLSourceElement.cpp:
     125        (WebCore::HTMLSourceElement::canSuspendForDocumentSuspension):
     126        (WebCore::HTMLSourceElement::canSuspendForPageCache): Deleted.
     127        * html/HTMLSourceElement.h:
     128        * html/PublicURLManager.cpp:
     129        (WebCore::PublicURLManager::canSuspendForDocumentSuspension):
     130        (WebCore::PublicURLManager::canSuspendForPageCache): Deleted.
     131        * html/PublicURLManager.h:
     132        * html/canvas/WebGLRenderingContextBase.cpp:
     133        (WebCore::WebGLRenderingContextBase::canSuspendForDocumentSuspension):
     134        (WebCore::WebGLRenderingContextBase::canSuspendForPageCache): Deleted.
     135        * html/canvas/WebGLRenderingContextBase.h:
     136        * loader/FrameLoader.cpp:
     137        (WebCore::FrameLoader::clear):
     138        (WebCore::FrameLoader::open):
     139        * loader/appcache/DOMApplicationCache.cpp:
     140        (WebCore::DOMApplicationCache::disconnectFrameForDocumentSuspension):
     141        (WebCore::DOMApplicationCache::reconnectFrameFromDocumentSuspension):
     142        (WebCore::DOMApplicationCache::disconnectFrameForPageCache): Deleted.
     143        (WebCore::DOMApplicationCache::reconnectFrameFromPageCache): Deleted.
     144        * loader/appcache/DOMApplicationCache.h:
     145        * page/DOMWindow.cpp:
     146        (WebCore::DOMWindow::DOMWindow):
     147        (WebCore::DOMWindow::~DOMWindow):
     148        (WebCore::DOMWindow::resetUnlessSuspendedForDocumentSuspension):
     149        (WebCore::DOMWindow::suspendForDocumentSuspension):
     150        (WebCore::DOMWindow::resumeFromDocumentSuspension):
     151        (WebCore::DOMWindow::disconnectDOMWindowProperties):
     152        (WebCore::DOMWindow::reconnectDOMWindowProperties):
     153        (WebCore::DOMWindow::resetUnlessSuspendedForPageCache): Deleted.
     154        (WebCore::DOMWindow::suspendForPageCache): Deleted.
     155        (WebCore::DOMWindow::resumeFromPageCache): Deleted.
     156        * page/DOMWindow.h:
     157        * page/DOMWindowExtension.cpp:
     158        (WebCore::DOMWindowExtension::disconnectFrameForDocumentSuspension):
     159        (WebCore::DOMWindowExtension::reconnectFrameFromDocumentSuspension):
     160        (WebCore::DOMWindowExtension::disconnectFrameForPageCache): Deleted.
     161        (WebCore::DOMWindowExtension::reconnectFrameFromPageCache): Deleted.
     162        * page/DOMWindowExtension.h:
     163        * page/DOMWindowProperty.cpp:
     164        (WebCore::DOMWindowProperty::disconnectFrameForDocumentSuspension):
     165        (WebCore::DOMWindowProperty::reconnectFrameFromDocumentSuspension):
     166        (WebCore::DOMWindowProperty::disconnectFrameForPageCache): Deleted.
     167        (WebCore::DOMWindowProperty::reconnectFrameFromPageCache): Deleted.
     168        * page/DOMWindowProperty.h:
     169        * page/EventSource.cpp:
     170        (WebCore::EventSource::canSuspendForDocumentSuspension):
     171        (WebCore::EventSource::canSuspendForPageCache): Deleted.
     172        * page/EventSource.h:
     173        * page/SuspendableTimer.cpp:
     174        (WebCore::SuspendableTimer::canSuspendForDocumentSuspension):
     175        (WebCore::SuspendableTimer::canSuspendForPageCache): Deleted.
     176        * page/SuspendableTimer.h:
     177        * workers/Worker.cpp:
     178        (WebCore::Worker::canSuspendForDocumentSuspension):
     179        (WebCore::Worker::canSuspendForPageCache): Deleted.
     180        * workers/Worker.h:
     181        * xml/XMLHttpRequest.cpp:
     182        (WebCore::XMLHttpRequest::canSuspendForDocumentSuspension):
     183        (WebCore::XMLHttpRequest::canSuspendForPageCache): Deleted.
     184        * xml/XMLHttpRequest.h:
     185
    11862015-11-30  Brady Eidson  <beidson@apple.com>
    2187

  • trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp

    r184709 r192848  
    266266}
    267267
    268 bool MediaKeySession::canSuspendForPageCache() const
     268bool MediaKeySession::canSuspendForDocumentSuspension() const
    269269{
    270270    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h

    r185923 r192848  
    114114    // ActiveDOMObject API.
    115115    void stop() override;
    116     bool canSuspendForPageCache() const override;
     116    bool canSuspendForDocumentSuspension() const override;
    117117    const char* activeDOMObjectName() const override;
    118118};

  • trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp

    r190391 r192848  
    162162}
    163163
    164 bool Geolocation::canSuspendForPageCache() const
     164bool Geolocation::canSuspendForDocumentSuspension() const
    165165{
    166166    return true;

  • trunk/Source/WebCore/Modules/geolocation/Geolocation.h

    r190391 r192848  
    8080    // ActiveDOMObject
    8181    void stop() override;
    82     bool canSuspendForPageCache() const override;
     82    bool canSuspendForDocumentSuspension() const override;
    8383    void suspend(ReasonForSuspension) override;
    8484    void resume() override;

  • trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp

    r190291 r192848  
    6565}
    6666
    67 void DOMWindowIndexedDatabase::disconnectFrameForPageCache()
     67void DOMWindowIndexedDatabase::disconnectFrameForDocumentSuspension()
    6868{
    6969    m_suspendedIDBFactory = m_idbFactory.release();
    70     DOMWindowProperty::disconnectFrameForPageCache();
     70    DOMWindowProperty::disconnectFrameForDocumentSuspension();
    7171}
    7272
    73 void DOMWindowIndexedDatabase::reconnectFrameFromPageCache(Frame* frame)
     73void DOMWindowIndexedDatabase::reconnectFrameFromDocumentSuspension(Frame* frame)
    7474{
    75     DOMWindowProperty::reconnectFrameFromPageCache(frame);
     75    DOMWindowProperty::reconnectFrameFromDocumentSuspension(frame);
    7676    m_idbFactory = m_suspendedIDBFactory.release();
    7777}

  • trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.h

    r182068 r192848  
    4747    static IDBFactory* indexedDB(DOMWindow*);
    4848
    49     virtual void disconnectFrameForPageCache() override;
    50     virtual void reconnectFrameFromPageCache(Frame*) override;
     49    virtual void disconnectFrameForDocumentSuspension() override;
     50    virtual void reconnectFrameFromDocumentSuspension(Frame*) override;
    5151    virtual void willDestroyGlobalObjectInCachedFrame() override;
    5252    virtual void willDestroyGlobalObjectInFrame() override;

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp

    r192813 r192848  
    235235}
    236236
    237 bool IDBDatabase::canSuspendForPageCache() const
     237bool IDBDatabase::canSuspendForDocumentSuspension() const
    238238{
    239239    // FIXME: This value will sometimes be false when database operations are actually in progress.

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h

    r192720 r192848  
    6868
    6969    virtual const char* activeDOMObjectName() const override final;
    70     virtual bool canSuspendForPageCache() const override final;
     70    virtual bool canSuspendForDocumentSuspension() const override final;
    7171
    7272    const IDBDatabaseInfo& info() const { return m_info; }

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp

    r192833 r192848  
    217217}
    218218
    219 bool IDBRequest::canSuspendForPageCache() const
     219bool IDBRequest::canSuspendForDocumentSuspension() const
    220220{
    221221    return false;

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h

    r192833 r192848  
    109109    // ActiveDOMObject.
    110110    virtual const char* activeDOMObjectName() const override final;
    111     virtual bool canSuspendForPageCache() const override final;
     111    virtual bool canSuspendForDocumentSuspension() const override final;
    112112    virtual bool hasPendingActivity() const override final;
    113113   

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp

    r192813 r192848  
    207207}
    208208
    209 bool IDBTransaction::canSuspendForPageCache() const
     209bool IDBTransaction::canSuspendForDocumentSuspension() const
    210210{
    211211    return false;

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h

    r192813 r192848  
    8080
    8181    virtual const char* activeDOMObjectName() const override final;
    82     virtual bool canSuspendForPageCache() const override final;
     82    virtual bool canSuspendForDocumentSuspension() const override final;
    8383    virtual bool hasPendingActivity() const override final;
    8484

  • trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.cpp

    r192354 r192848  
    394394}
    395395
    396 bool LegacyDatabase::canSuspendForPageCache() const
     396bool LegacyDatabase::canSuspendForDocumentSuspension() const
    397397{
    398398    return m_isClosed;

  • trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.h

    r192354 r192848  
    111111    void stop() override;
    112112    const char* activeDOMObjectName() const override;
    113     bool canSuspendForPageCache() const override;
     113    bool canSuspendForDocumentSuspension() const override;
    114114
    115115    // EventTarget

  • trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp

    r192354 r192848  
    452452}
    453453
    454 bool LegacyRequest::canSuspendForPageCache() const
     454bool LegacyRequest::canSuspendForDocumentSuspension() const
    455455{
    456456    return !m_hasPendingActivity;

  • trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.h

    r192354 r192848  
    127127    void stop() override;
    128128    const char* activeDOMObjectName() const override;
    129     bool canSuspendForPageCache() const override;
     129    bool canSuspendForDocumentSuspension() const override;
    130130
    131131    // EventTarget API.

  • trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.cpp

    r192354 r192848  
    341341}
    342342
    343 bool LegacyTransaction::canSuspendForPageCache() const
     343bool LegacyTransaction::canSuspendForDocumentSuspension() const
    344344{
    345345    // FIXME: Technically we can suspend before the first request is schedule

  • trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.h

    r192354 r192848  
    112112
    113113    // ActiveDOMObject API.
    114     bool canSuspendForPageCache() const override;
     114    bool canSuspendForDocumentSuspension() const override;
    115115    void stop() override;
    116116    const char* activeDOMObjectName() const override;

  • trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp

    r191888 r192848  
    815815}
    816816
    817 bool MediaSource::canSuspendForPageCache() const
     817bool MediaSource::canSuspendForDocumentSuspension() const
    818818{
    819819    return isClosed() && !m_asyncEventQueue.hasPendingEvents();

  • trunk/Source/WebCore/Modules/mediasource/MediaSource.h

    r184709 r192848  
    120120    // ActiveDOMObject API.
    121121    void stop() override;
    122     bool canSuspendForPageCache() const override;
     122    bool canSuspendForDocumentSuspension() const override;
    123123    const char* activeDOMObjectName() const override;
    124124

  • trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

    r190516 r192848  
    511511}
    512512
    513 bool SourceBuffer::canSuspendForPageCache() const
     513bool SourceBuffer::canSuspendForDocumentSuspension() const
    514514{
    515515    return !hasPendingActivity();

  • trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h

    r183856 r192848  
    140140    void stop() override;
    141141    const char* activeDOMObjectName() const override;
    142     bool canSuspendForPageCache() const override;
     142    bool canSuspendForDocumentSuspension() const override;
    143143
    144144    // SourceBufferPrivateClient

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

    r192503 r192848  
    265265}
    266266
    267 bool MediaStreamTrack::canSuspendForPageCache() const
     267bool MediaStreamTrack::canSuspendForDocumentSuspension() const
    268268{
    269269    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

    r192503 r192848  
    109109    void stop() override final;
    110110    const char* activeDOMObjectName() const override final;
    111     bool canSuspendForPageCache() const override final;
     111    bool canSuspendForDocumentSuspension() const override final;
    112112
    113113    // EventTarget

  • trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp

    r192354 r192848  
    140140}
    141141
    142 bool RTCDTMFSender::canSuspendForPageCache() const
     142bool RTCDTMFSender::canSuspendForDocumentSuspension() const
    143143{
    144144    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h

    r192354 r192848  
    7070    void stop() override;
    7171    const char* activeDOMObjectName() const override;
    72     bool canSuspendForPageCache() const override;
     72    bool canSuspendForDocumentSuspension() const override;
    7373
    7474    void scheduleDispatchEvent(Ref<Event>&&);

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r192675 r192848  
    399399}
    400400
    401 bool RTCPeerConnection::canSuspendForPageCache() const
     401bool RTCPeerConnection::canSuspendForDocumentSuspension() const
    402402{
    403403    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

    r192464 r192848  
    118118    void stop() override;
    119119    const char* activeDOMObjectName() const override;
    120     bool canSuspendForPageCache() const override;
     120    bool canSuspendForDocumentSuspension() const override;
    121121
    122122    // PeerConnectionBackendClient

  • trunk/Source/WebCore/Modules/notifications/DOMWindowNotifications.cpp

    r170774 r192848  
    6969}
    7070
    71 void DOMWindowNotifications::disconnectFrameForPageCache()
     71void DOMWindowNotifications::disconnectFrameForDocumentSuspension()
    7272{
    7373    m_suspendedNotificationCenter = m_notificationCenter.release();
    74     DOMWindowProperty::disconnectFrameForPageCache();
     74    DOMWindowProperty::disconnectFrameForDocumentSuspension();
    7575}
    7676
    77 void DOMWindowNotifications::reconnectFrameFromPageCache(Frame* frame)
     77void DOMWindowNotifications::reconnectFrameFromDocumentSuspension(Frame* frame)
    7878{
    79     DOMWindowProperty::reconnectFrameFromPageCache(frame);
     79    DOMWindowProperty::reconnectFrameFromDocumentSuspension(frame);
    8080    m_notificationCenter = m_suspendedNotificationCenter.release();
    8181}

  • trunk/Source/WebCore/Modules/notifications/DOMWindowNotifications.h

    r168144 r192848  
    4747    static DOMWindowNotifications* from(DOMWindow*);
    4848
    49     virtual void disconnectFrameForPageCache() override;
    50     virtual void reconnectFrameFromPageCache(Frame*) override;
     49    virtual void disconnectFrameForDocumentSuspension() override;
     50    virtual void reconnectFrameFromDocumentSuspension(Frame*) override;
    5151    virtual void willDestroyGlobalObjectInCachedFrame() override;
    5252    virtual void willDestroyGlobalObjectInFrame() override;

  • trunk/Source/WebCore/Modules/notifications/Notification.cpp

    r185336 r192848  
    176176}
    177177
    178 bool Notification::canSuspendForPageCache() const
     178bool Notification::canSuspendForDocumentSuspension() const
    179179{
    180180    // We can suspend if the Notification is not shown yet or after it is closed.

  • trunk/Source/WebCore/Modules/notifications/Notification.h

    r185336 r192848  
    141141    void contextDestroyed() override;
    142142    const char* activeDOMObjectName() const override;
    143     bool canSuspendForPageCache() const override;
     143    bool canSuspendForDocumentSuspension() const override;
    144144
    145145    // EventTarget API.

  • trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp

    r183365 r192848  
    138138}
    139139
    140 bool NotificationCenter::canSuspendForPageCache() const
     140bool NotificationCenter::canSuspendForDocumentSuspension() const
    141141{
    142142    // We don't need to worry about Notifications because those are ActiveDOMObject too.

  • trunk/Source/WebCore/Modules/notifications/NotificationCenter.h

    r183365 r192848  
    6666    void stop() override;
    6767    const char* activeDOMObjectName() const override;
    68     bool canSuspendForPageCache() const override;
     68    bool canSuspendForDocumentSuspension() const override;
    6969
    7070    void timerFired();

  • trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

    r192027 r192848  
    356356}
    357357
    358 bool AudioContext::canSuspendForPageCache() const
     358bool AudioContext::canSuspendForDocumentSuspension() const
    359359{
    360360    // FIXME: We should be able to suspend while rendering as well with some more code.

  • trunk/Source/WebCore/Modules/webaudio/AudioContext.h

    r192027 r192848  
    309309    // ActiveDOMObject API.
    310310    void stop() override;
    311     bool canSuspendForPageCache() const override;
     311    bool canSuspendForDocumentSuspension() const override;
    312312    const char* activeDOMObjectName() const override;
    313313

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp

    r191427 r192848  
    143143}
    144144
    145 bool DatabaseContext::canSuspendForPageCache() const
     145bool DatabaseContext::canSuspendForDocumentSuspension() const
    146146{
    147147    if (!hasOpenDatabases() || !m_databaseThread)

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h

    r187926 r192848  
    7272    void contextDestroyed() override;
    7373    void stop() override;
    74     bool canSuspendForPageCache() const override;
     74    bool canSuspendForDocumentSuspension() const override;
    7575    const char* activeDOMObjectName() const override { return "DatabaseContext"; }
    7676

  • trunk/Source/WebCore/Modules/websockets/WebSocket.cpp

    r192354 r192848  
    476476}
    477477
    478 bool WebSocket::canSuspendForPageCache() const
     478bool WebSocket::canSuspendForDocumentSuspension() const
    479479{
    480480    return true;

  • trunk/Source/WebCore/Modules/websockets/WebSocket.h

    r187556 r192848  
    116116    // ActiveDOMObject API.
    117117    void contextDestroyed() override;
    118     bool canSuspendForPageCache() const override;
     118    bool canSuspendForDocumentSuspension() const override;
    119119    void suspend(ReasonForSuspension) override;
    120120    void resume() override;

  • trunk/Source/WebCore/css/FontLoader.cpp

    r192354 r192848  
    162162}
    163163
    164 bool FontLoader::canSuspendForPageCache() const
     164bool FontLoader::canSuspendForDocumentSuspension() const
    165165{
    166166    return !m_numLoadingFromCSS && !m_numLoadingFromJS;

  • trunk/Source/WebCore/css/FontLoader.h

    r192354 r192848  
    9090    // ActiveDOMObject API.
    9191    const char* activeDOMObjectName() const override;
    92     bool canSuspendForPageCache() const override;
     92    bool canSuspendForDocumentSuspension() const override;
    9393
    9494    void scheduleEvent(PassRefPtr<Event>);

  • trunk/Source/WebCore/dom/ActiveDOMObject.cpp

    r182544 r192848  
    9191}
    9292
    93 bool ActiveDOMObject::canSuspendForPageCache() const
     93bool ActiveDOMObject::canSuspendForDocumentSuspension() const
    9494{
    9595    return false;

  • trunk/Source/WebCore/dom/ActiveDOMObject.h

    r182544 r192848  
    4343    virtual bool hasPendingActivity() const;
    4444
    45     // The canSuspendForPageCache() function is used by the caller if there is a choice between suspending
     45    // The canSuspendForDocumentSuspension() function is used by the caller if there is a choice between suspending
    4646    // and stopping. For example, a page won't be suspended and placed in the back/forward
    4747    // cache if it contains any objects that cannot be suspended.
    4848
    49     // However, the suspend function will sometimes be called even if canSuspendForPageCache() returns false.
     49    // However, the suspend function will sometimes be called even if canSuspendForDocumentSuspension() returns false.
    5050    // That happens in step-by-step JS debugging for example - in this case it would be incorrect
    5151    // to stop the object. Exact semantics of suspend is up to the object in cases like that.
    … …  
    6363    // These three functions must not have a side effect of creating or destroying
    6464    // any ActiveDOMObject. That means they must not result in calls to arbitrary JavaScript.
    65     virtual bool canSuspendForPageCache() const = 0; // Returning false in canSuspendForPageCache() will prevent the page from entering the PageCache.
     65    virtual bool canSuspendForDocumentSuspension() const = 0; // Returning false in canSuspendForDocumentSuspension() will prevent the page from entering the PageCache.
    6666    virtual void suspend(ReasonForSuspension);
    6767    virtual void resume();

  • trunk/Source/WebCore/dom/Document.cpp

    r192711 r192848  
    605605    // FIXME: Should we reset m_domWindow when we detach from the Frame?
    606606    if (m_domWindow)
    607         m_domWindow->resetUnlessSuspendedForPageCache();
     607        m_domWindow->resetUnlessSuspendedForDocumentSuspension();
    608608
    609609    m_scriptRunner = nullptr;

  • trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

    r192354 r192848  
    177177}
    178178
    179 bool ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache(Vector<ActiveDOMObject*>* unsuspendableObjects)
     179bool ScriptExecutionContext::canSuspendActiveDOMObjectsForDocumentSuspension(Vector<ActiveDOMObject*>* unsuspendableObjects)
    180180{
    181181    checkConsistency();
    … …  
    194194    NoEventDispatchAssertion assertNoEventDispatch;
    195195    for (auto* activeDOMObject : m_activeDOMObjects) {
    196         if (!activeDOMObject->canSuspendForPageCache()) {
     196        if (!activeDOMObject->canSuspendForDocumentSuspension()) {
    197197            canSuspend = false;
    198198            if (unsuspendableObjects)

  • trunk/Source/WebCore/dom/ScriptExecutionContext.h

    r188388 r192848  
    8686
    8787    // Active objects are not garbage collected even if inaccessible, e.g. because their activity may result in callbacks being invoked.
    88     WEBCORE_EXPORT bool canSuspendActiveDOMObjectsForPageCache(Vector<ActiveDOMObject*>* unsuspendableObjects = nullptr);
    89 
    90     // Active objects can be asked to suspend even if canSuspendActiveDOMObjectsForPageCache() returns 'false' -
     88    WEBCORE_EXPORT bool canSuspendActiveDOMObjectsForDocumentSuspension(Vector<ActiveDOMObject*>* unsuspendableObjects = nullptr);
     89
     90    // Active objects can be asked to suspend even if canSuspendActiveDOMObjectsForDocumentSuspension() returns 'false' -
    9191    // step-by-step JS debugging is one example.
    9292    virtual void suspendActiveDOMObjects(ActiveDOMObject::ReasonForSuspension);

  • trunk/Source/WebCore/fileapi/FileReader.cpp

    r189485 r192848  
    6666}
    6767
    68 bool FileReader::canSuspendForPageCache() const
     68bool FileReader::canSuspendForDocumentSuspension() const
    6969{
    7070    // FIXME: It is not currently possible to suspend a FileReader, so pages with FileReader can not go into page cache.

  • trunk/Source/WebCore/fileapi/FileReader.h

    r189485 r192848  
    9898    // ActiveDOMObject API.
    9999    const char* activeDOMObjectName() const override;
    100     bool canSuspendForPageCache() const override;
     100    bool canSuspendForDocumentSuspension() const override;
    101101    void stop() override;
    102102

  • trunk/Source/WebCore/history/CachedFrame.cpp

    r192711 r192848  
    171171    m_cachedFrameScriptData = std::make_unique<ScriptCachedFrameData>(frame);
    172172
    173     m_document->domWindow()->suspendForPageCache();
     173    m_document->domWindow()->suspendForDocumentSuspension();
    174174
    175175    frame.loader().client().savePlatformDataToCachedFrame(this);

  • trunk/Source/WebCore/history/PageCache.cpp

    r188765 r192848  
    150150
    151151    Vector<ActiveDOMObject*> unsuspendableObjects;
    152     if (!frame.document()->canSuspendActiveDOMObjectsForPageCache(&unsuspendableObjects)) {
     152    if (!frame.document()->canSuspendActiveDOMObjectsForDocumentSuspension(&unsuspendableObjects)) {
    153153        PCLOG("   -The document cannot suspend its active DOM Objects");
    154154        for (auto* activeDOMObject : unsuspendableObjects) {

  • trunk/Source/WebCore/html/HTMLMarqueeElement.cpp

    r182544 r192848  
    167167}
    168168
    169 bool HTMLMarqueeElement::canSuspendForPageCache() const
     169bool HTMLMarqueeElement::canSuspendForDocumentSuspension() const
    170170{
    171171    return true;

  • trunk/Source/WebCore/html/HTMLMarqueeElement.h

    r189841 r192848  
    5858
    5959    // ActiveDOMObject
    60     virtual bool canSuspendForPageCache() const override;
     60    virtual bool canSuspendForDocumentSuspension() const override;
    6161    virtual void suspend(ReasonForSuspension) override;
    6262    virtual void resume() override;

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r192711 r192848  
    49474947}
    49484948
    4949 bool HTMLMediaElement::canSuspendForPageCache() const
     4949bool HTMLMediaElement::canSuspendForDocumentSuspension() const
    49504950{
    49514951    return true;

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r192711 r192848  
    505505    // ActiveDOMObject API.
    506506    const char* activeDOMObjectName() const override;
    507     bool canSuspendForPageCache() const override;
     507    bool canSuspendForDocumentSuspension() const override;
    508508    void suspend(ReasonForSuspension) override;
    509509    void resume() override;

  • trunk/Source/WebCore/html/HTMLSourceElement.cpp

    r187031 r192848  
    130130}
    131131
    132 bool HTMLSourceElement::canSuspendForPageCache() const
     132bool HTMLSourceElement::canSuspendForDocumentSuspension() const
    133133{
    134134    return true;

  • trunk/Source/WebCore/html/HTMLSourceElement.h

    r187031 r192848  
    5555    // ActiveDOMObject.
    5656    const char* activeDOMObjectName() const override;
    57     bool canSuspendForPageCache() const override;
     57    bool canSuspendForDocumentSuspension() const override;
    5858    void suspend(ReasonForSuspension) override;
    5959    void resume() override;

  • trunk/Source/WebCore/html/PublicURLManager.cpp

    r190613 r192848  
    8181}
    8282
    83 bool PublicURLManager::canSuspendForPageCache() const
     83bool PublicURLManager::canSuspendForDocumentSuspension() const
    8484{
    8585    // Suspending an PublicURLManager is safe as it does not cause any JS to be executed.

  • trunk/Source/WebCore/html/PublicURLManager.h

    r182544 r192848  
    5454    // ActiveDOMObject API.
    5555    void stop() override;
    56     bool canSuspendForPageCache() const override;
     56    bool canSuspendForDocumentSuspension() const override;
    5757    const char* activeDOMObjectName() const override;
    5858   

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

    r192607 r192848  
    39283928}
    39293929
    3930 bool WebGLRenderingContextBase::canSuspendForPageCache() const
     3930bool WebGLRenderingContextBase::canSuspendForDocumentSuspension() const
    39313931{
    39323932    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h

    r191049 r192848  
    385385    virtual void stop() override;
    386386    virtual const char* activeDOMObjectName() const override;
    387     bool canSuspendForPageCache() const override;
     387    bool canSuspendForDocumentSuspension() const override;
    388388
    389389    void addSharedObject(WebGLSharedObject*);

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r192844 r192848  
    585585    if (clearWindowProperties) {
    586586        InspectorInstrumentation::frameWindowDiscarded(&m_frame, m_frame.document()->domWindow());
    587         m_frame.document()->domWindow()->resetUnlessSuspendedForPageCache();
     587        m_frame.document()->domWindow()->resetUnlessSuspendedForDocumentSuspension();
    588588        m_frame.script().clearWindowShell(newDocument->domWindow(), m_frame.document()->inPageCache());
    589589    }
    … …  
    20752075   
    20762076    m_frame.setDocument(document);
    2077     document->domWindow()->resumeFromPageCache();
     2077    document->domWindow()->resumeFromDocumentSuspension();
    20782078
    20792079    updateFirstPartyForCookies();

  • trunk/Source/WebCore/loader/appcache/DOMApplicationCache.cpp

    r191369 r192848  
    4747}
    4848
    49 void DOMApplicationCache::disconnectFrameForPageCache()
     49void DOMApplicationCache::disconnectFrameForDocumentSuspension()
    5050{
    5151    if (ApplicationCacheHost* cacheHost = applicationCacheHost())
    5252        cacheHost->setDOMApplicationCache(nullptr);
    53     DOMWindowProperty::disconnectFrameForPageCache();
     53    DOMWindowProperty::disconnectFrameForDocumentSuspension();
    5454}
    5555
    56 void DOMApplicationCache::reconnectFrameFromPageCache(Frame* frame)
     56void DOMApplicationCache::reconnectFrameFromDocumentSuspension(Frame* frame)
    5757{
    58     DOMWindowProperty::reconnectFrameFromPageCache(frame);
     58    DOMWindowProperty::reconnectFrameFromDocumentSuspension(frame);
    5959    if (ApplicationCacheHost* cacheHost = applicationCacheHost())
    6060        cacheHost->setDOMApplicationCache(this);

  • trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h

    r181169 r192848  
    4747    virtual ~DOMApplicationCache() { ASSERT(!m_frame); }
    4848
    49     virtual void disconnectFrameForPageCache() override;
    50     virtual void reconnectFrameFromPageCache(Frame*) override;
     49    virtual void disconnectFrameForDocumentSuspension() override;
     50    virtual void reconnectFrameFromDocumentSuspension(Frame*) override;
    5151    virtual void willDestroyGlobalObjectInFrame() override;
    5252

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r192582 r192848  
    394394    , FrameDestructionObserver(document->frame())
    395395    , m_shouldPrintWhenFinishedLoading(false)
    396     , m_suspendedForPageCache(false)
     396    , m_suspendedForDocumentSuspension(false)
    397397    , m_lastPageStatus(PageStatusNone)
    398398    , m_weakPtrFactory(this)
    … …  
    419419{
    420420#ifndef NDEBUG
    421     if (!m_suspendedForPageCache) {
     421    if (!m_suspendedForDocumentSuspension) {
    422422        ASSERT(!m_screen);
    423423        ASSERT(!m_history);
    … …  
    441441#endif
    442442
    443     if (m_suspendedForPageCache)
     443    if (m_suspendedForDocumentSuspension)
    444444        willDestroyCachedFrame();
    445445    else
    … …  
    543543}
    544544
    545 void DOMWindow::resetUnlessSuspendedForPageCache()
    546 {
    547     if (m_suspendedForPageCache)
     545void DOMWindow::resetUnlessSuspendedForDocumentSuspension()
     546{
     547    if (m_suspendedForDocumentSuspension)
    548548        return;
    549549    willDestroyDocumentInFrame();
    … …  
    551551}
    552552
    553 void DOMWindow::suspendForPageCache()
     553void DOMWindow::suspendForDocumentSuspension()
    554554{
    555555    disconnectDOMWindowProperties();
    556     m_suspendedForPageCache = true;
    557 }
    558 
    559 void DOMWindow::resumeFromPageCache()
     556    m_suspendedForDocumentSuspension = true;
     557}
     558
     559void DOMWindow::resumeFromDocumentSuspension()
    560560{
    561561    reconnectDOMWindowProperties();
    562     m_suspendedForPageCache = false;
     562    m_suspendedForDocumentSuspension = false;
    563563}
    564564
    … …  
    566566{
    567567    // It is necessary to copy m_properties to a separate vector because the DOMWindowProperties may
    568     // unregister themselves from the DOMWindow as a result of the call to disconnectFrameForPageCache.
     568    // unregister themselves from the DOMWindow as a result of the call to disconnectFrameForDocumentSuspension.
    569569    Vector<DOMWindowProperty*> properties;
    570570    copyToVector(m_properties, properties);
    571571    for (auto& property : properties)
    572         property->disconnectFrameForPageCache();
     572        property->disconnectFrameForDocumentSuspension();
    573573}
    574574
    575575void DOMWindow::reconnectDOMWindowProperties()
    576576{
    577     ASSERT(m_suspendedForPageCache);
     577    ASSERT(m_suspendedForDocumentSuspension);
    578578    // It is necessary to copy m_properties to a separate vector because the DOMWindowProperties may
    579579    // unregister themselves from the DOMWindow as a result of the call to reconnectFromPageCache.
    … …  
    581581    copyToVector(m_properties, properties);
    582582    for (auto& property : properties)
    583         property->reconnectFrameFromPageCache(m_frame);
     583        property->reconnectFrameFromDocumentSuspension(m_frame);
    584584}
    585585

  • trunk/Source/WebCore/page/DOMWindow.h

    r192354 r192848  
    120120        void unregisterProperty(DOMWindowProperty*);
    121121
    122         void resetUnlessSuspendedForPageCache();
    123         void suspendForPageCache();
    124         void resumeFromPageCache();
     122        void resetUnlessSuspendedForDocumentSuspension();
     123        void suspendForDocumentSuspension();
     124        void resumeFromDocumentSuspension();
    125125
    126126        PassRefPtr<MediaQueryList> matchMedia(const String&);
    … …  
    370370
    371371        bool m_shouldPrintWhenFinishedLoading;
    372         bool m_suspendedForPageCache;
     372        bool m_suspendedForDocumentSuspension;
    373373
    374374        HashSet<DOMWindowProperty*> m_properties;

  • trunk/Source/WebCore/page/DOMWindowExtension.cpp

    r185231 r192848  
    4444}
    4545
    46 void DOMWindowExtension::disconnectFrameForPageCache()
     46void DOMWindowExtension::disconnectFrameForDocumentSuspension()
    4747{
    4848    // Calling out to the client might result in this DOMWindowExtension being destroyed
    … …  
    5555    m_disconnectedFrame = frame;
    5656
    57     DOMWindowProperty::disconnectFrameForPageCache();
     57    DOMWindowProperty::disconnectFrameForDocumentSuspension();
    5858}
    5959
    60 void DOMWindowExtension::reconnectFrameFromPageCache(Frame* frame)
     60void DOMWindowExtension::reconnectFrameFromDocumentSuspension(Frame* frame)
    6161{
    6262    ASSERT(m_disconnectedFrame == frame);
    6363   
    64     DOMWindowProperty::reconnectFrameFromPageCache(frame);
     64    DOMWindowProperty::reconnectFrameFromDocumentSuspension(frame);
    6565    m_disconnectedFrame = nullptr;
    6666

  • trunk/Source/WebCore/page/DOMWindowExtension.h

    r177733 r192848  
    4444    }
    4545
    46     virtual void disconnectFrameForPageCache() override;
    47     virtual void reconnectFrameFromPageCache(Frame*) override;
     46    virtual void disconnectFrameForDocumentSuspension() override;
     47    virtual void reconnectFrameFromDocumentSuspension(Frame*) override;
    4848    virtual void willDestroyGlobalObjectInCachedFrame() override;
    4949    virtual void willDestroyGlobalObjectInFrame() override;

  • trunk/Source/WebCore/page/DOMWindowProperty.cpp

    r185231 r192848  
    5656}
    5757
    58 void DOMWindowProperty::disconnectFrameForPageCache()
     58void DOMWindowProperty::disconnectFrameForDocumentSuspension()
    5959{
    6060    // If this property is being disconnected from its Frame to enter the PageCache, it must have
    … …  
    6666}
    6767
    68 void DOMWindowProperty::reconnectFrameFromPageCache(Frame* frame)
     68void DOMWindowProperty::reconnectFrameFromDocumentSuspension(Frame* frame)
    6969{
    7070    // If this property is being reconnected to its Frame to enter the PageCache, it must have

  • trunk/Source/WebCore/page/DOMWindowProperty.h

    r119136 r192848  
    3636    explicit DOMWindowProperty(Frame*);
    3737
    38     virtual void disconnectFrameForPageCache();
    39     virtual void reconnectFrameFromPageCache(Frame*);
     38    virtual void disconnectFrameForDocumentSuspension();
     39    virtual void reconnectFrameFromDocumentSuspension(Frame*);
    4040    virtual void willDestroyGlobalObjectInCachedFrame();
    4141    virtual void willDestroyGlobalObjectInFrame();

  • trunk/Source/WebCore/page/EventSource.cpp

    r192354 r192848  
    405405}
    406406
    407 bool EventSource::canSuspendForPageCache() const
     407bool EventSource::canSuspendForDocumentSuspension() const
    408408{
    409409    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/page/EventSource.h

    r192354 r192848  
    9191    void stop() override;
    9292    const char* activeDOMObjectName() const override;
    93     bool canSuspendForPageCache() const override;
     93    bool canSuspendForDocumentSuspension() const override;
    9494
    9595    void connect();

  • trunk/Source/WebCore/page/SuspendableTimer.cpp

    r182544 r192848  
    8585}
    8686
    87 bool SuspendableTimer::canSuspendForPageCache() const
     87bool SuspendableTimer::canSuspendForDocumentSuspension() const
    8888{
    8989    return true;

  • trunk/Source/WebCore/page/SuspendableTimer.h

    r182544 r192848  
    6161    bool hasPendingActivity() const override final;
    6262    void stop() override final;
    63     bool canSuspendForPageCache() const override final;
     63    bool canSuspendForDocumentSuspension() const override final;
    6464    void suspend(ReasonForSuspension) override final;
    6565    void resume() override final;

  • trunk/Source/WebCore/workers/Worker.cpp

    r190281 r192848  
    125125}
    126126
    127 bool Worker::canSuspendForPageCache() const
     127bool Worker::canSuspendForDocumentSuspension() const
    128128{
    129129    // FIXME: It is not currently possible to suspend a worker, so pages with workers can not go into page cache.

  • trunk/Source/WebCore/workers/Worker.h

    r184709 r192848  
    7676
    7777        // ActiveDOMObject API.
    78         bool canSuspendForPageCache() const override;
     78        bool canSuspendForDocumentSuspension() const override;
    7979        void stop() override;
    8080        const char* activeDOMObjectName() const override;

  • trunk/Source/WebCore/xml/XMLHttpRequest.cpp

    r192680 r192848  
    12471247}
    12481248
    1249 bool XMLHttpRequest::canSuspendForPageCache() const
     1249bool XMLHttpRequest::canSuspendForDocumentSuspension() const
    12501250{
    12511251    // If the load event has not fired yet, cancelling the load in suspend() may cause

  • trunk/Source/WebCore/xml/XMLHttpRequest.h

    r192680 r192848  
    149149    // ActiveDOMObject
    150150    void contextDestroyed() override;
    151     bool canSuspendForPageCache() const override;
     151    bool canSuspendForDocumentSuspension() const override;
    152152    void suspend(ReasonForSuspension) override;
    153153    void resume() override;

  • trunk/Source/WebKit/mac/ChangeLog

    r192844 r192848  
     12015-11-30  Katlyn Graff  <kgraff@apple.com>
     2
     3        Rename ActiveDOMObject/DOMWindow PageCacheSuspension code to support more reasons for suspension
     4        https://bugs.webkit.org/show_bug.cgi?id=151677
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * WebView/WebFrame.mm:
     9        (-[WebFrame _cacheabilityDictionary]):
     10
    1112015-11-30  Jiewen Tan  <jiewen_tan@apple.com>
    212

  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r192140 r192848  
    20542054        if (DatabaseManager::singleton().hasOpenDatabases(document))
    20552055            [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
    2056         if (!document->canSuspendActiveDOMObjectsForPageCache())
     2056        if (!document->canSuspendActiveDOMObjectsForDocumentSuspension())
    20572057            [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameCanSuspendActiveDOMObjects];
    20582058    }
Note: See TracChangeset for help on using the changeset viewer.