<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192711] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192711">192711</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-20 17:42:11 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Renaming PageCache suspension code to support more reasons for suspension.
https://bugs.webkit.org/show_bug.cgi?id=151527
Patch by Katlyn Graff <kgraff@apple.com> on 2015-11-20
Reviewed by Ryosuke Niwa.
No new tests because this is simply a refactor.
Renamed Element:: and Document:: documentWillSuspendForPageCache(),
documentDidResumeFromPageCache(),
registerForPageCacheSuspensionCallbacks(),
unregisterForPageCacheSuspensionCallbacks() to prepare to support
alternate reasons for document-level suspension.
* dom/Document.cpp:
(WebCore::Document::suspend):
(WebCore::Document::resume):
(WebCore::Document::registerForDocumentSuspensionCallbacks):
(WebCore::Document::unregisterForDocumentSuspensionCallbacks):
(WebCore::Document::documentWillSuspendForPageCache): Deleted.
(WebCore::Document::documentDidResumeFromPageCache): Deleted.
(WebCore::Document::registerForPageCacheSuspensionCallbacks): Deleted.
(WebCore::Document::unregisterForPageCacheSuspensionCallbacks): Deleted.
* dom/Document.h:
* dom/Element.h:
(WebCore::Element::prepareForDocumentSuspension):
(WebCore::Element::resumeFromDocumentSuspension):
(WebCore::Element::documentWillSuspendForPageCache): Deleted.
(WebCore::Element::documentDidResumeFromPageCache): Deleted.
* history/CachedFrame.cpp:
(WebCore::CachedFrameBase::restore):
(WebCore::CachedFrame::CachedFrame):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::~HTMLFormElement):
(WebCore::HTMLFormElement::parseAttribute):
(WebCore::HTMLFormElement::resumeFromDocumentSuspension):
(WebCore::HTMLFormElement::didMoveToNewDocument):
(WebCore::HTMLFormElement::documentDidResumeFromPageCache): Deleted.
* html/HTMLFormElement.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::~HTMLInputElement):
(WebCore::HTMLInputElement::registerForSuspensionCallbackIfNeeded):
(WebCore::HTMLInputElement::unregisterForSuspensionCallbackIfNeeded):
(WebCore::HTMLInputElement::resumeFromDocumentSuspension):
(WebCore::HTMLInputElement::prepareForDocumentSuspension):
(WebCore::HTMLInputElement::didMoveToNewDocument):
(WebCore::HTMLInputElement::documentDidResumeFromPageCache): Deleted.
(WebCore::HTMLInputElement::documentWillSuspendForPageCache): Deleted.
* html/HTMLInputElement.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::registerWithDocument):
(WebCore::HTMLMediaElement::unregisterWithDocument):
(WebCore::HTMLMediaElement::prepareForDocumentSuspension):
(WebCore::HTMLMediaElement::resumeFromDocumentSuspension):
(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): Deleted.
(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): Deleted.
* html/HTMLMediaElement.h:
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::~HTMLPlugInImageElement):
(WebCore::HTMLPlugInImageElement::createElementRenderer):
(WebCore::HTMLPlugInImageElement::didMoveToNewDocument):
(WebCore::HTMLPlugInImageElement::prepareForDocumentSuspension):
(WebCore::HTMLPlugInImageElement::resumeFromDocumentSuspension):
(WebCore::HTMLPlugInImageElement::documentWillSuspendForPageCache): Deleted.
(WebCore::HTMLPlugInImageElement::documentDidResumeFromPageCache): Deleted.
* html/HTMLPlugInImageElement.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::SVGSVGElement):
(WebCore::SVGSVGElement::~SVGSVGElement):
(WebCore::SVGSVGElement::didMoveToNewDocument):
(WebCore::SVGSVGElement::prepareForDocumentSuspension):
(WebCore::SVGSVGElement::resumeFromDocumentSuspension):
(WebCore::SVGSVGElement::documentWillSuspendForPageCache): Deleted.
(WebCore::SVGSVGElement::documentDidResumeFromPageCache): Deleted.
* svg/SVGSVGElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementh">trunk/Source/WebCore/html/HTMLFormElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGSVGElementcpp">trunk/Source/WebCore/svg/SVGSVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGSVGElementh">trunk/Source/WebCore/svg/SVGSVGElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/ChangeLog 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -1,3 +1,82 @@
</span><ins>+2015-11-20 Katlyn Graff <kgraff@apple.com>
+
+ Renaming PageCache suspension code to support more reasons for suspension.
+ https://bugs.webkit.org/show_bug.cgi?id=151527
+
+ Reviewed by Ryosuke Niwa.
+
+ No new tests because this is simply a refactor.
+
+ Renamed Element:: and Document:: documentWillSuspendForPageCache(),
+ documentDidResumeFromPageCache(),
+ registerForPageCacheSuspensionCallbacks(),
+ unregisterForPageCacheSuspensionCallbacks() to prepare to support
+ alternate reasons for document-level suspension.
+
+ * dom/Document.cpp:
+ (WebCore::Document::suspend):
+ (WebCore::Document::resume):
+ (WebCore::Document::registerForDocumentSuspensionCallbacks):
+ (WebCore::Document::unregisterForDocumentSuspensionCallbacks):
+ (WebCore::Document::documentWillSuspendForPageCache): Deleted.
+ (WebCore::Document::documentDidResumeFromPageCache): Deleted.
+ (WebCore::Document::registerForPageCacheSuspensionCallbacks): Deleted.
+ (WebCore::Document::unregisterForPageCacheSuspensionCallbacks): Deleted.
+ * dom/Document.h:
+ * dom/Element.h:
+ (WebCore::Element::prepareForDocumentSuspension):
+ (WebCore::Element::resumeFromDocumentSuspension):
+ (WebCore::Element::documentWillSuspendForPageCache): Deleted.
+ (WebCore::Element::documentDidResumeFromPageCache): Deleted.
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore):
+ (WebCore::CachedFrame::CachedFrame):
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::~HTMLFormElement):
+ (WebCore::HTMLFormElement::parseAttribute):
+ (WebCore::HTMLFormElement::resumeFromDocumentSuspension):
+ (WebCore::HTMLFormElement::didMoveToNewDocument):
+ (WebCore::HTMLFormElement::documentDidResumeFromPageCache): Deleted.
+ * html/HTMLFormElement.h:
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::~HTMLInputElement):
+ (WebCore::HTMLInputElement::registerForSuspensionCallbackIfNeeded):
+ (WebCore::HTMLInputElement::unregisterForSuspensionCallbackIfNeeded):
+ (WebCore::HTMLInputElement::resumeFromDocumentSuspension):
+ (WebCore::HTMLInputElement::prepareForDocumentSuspension):
+ (WebCore::HTMLInputElement::didMoveToNewDocument):
+ (WebCore::HTMLInputElement::documentDidResumeFromPageCache): Deleted.
+ (WebCore::HTMLInputElement::documentWillSuspendForPageCache): Deleted.
+ * html/HTMLInputElement.h:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::registerWithDocument):
+ (WebCore::HTMLMediaElement::unregisterWithDocument):
+ (WebCore::HTMLMediaElement::prepareForDocumentSuspension):
+ (WebCore::HTMLMediaElement::resumeFromDocumentSuspension):
+ (WebCore::HTMLMediaElement::documentWillSuspendForPageCache): Deleted.
+ (WebCore::HTMLMediaElement::documentDidResumeFromPageCache): Deleted.
+ * html/HTMLMediaElement.h:
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::~HTMLPlugInImageElement):
+ (WebCore::HTMLPlugInImageElement::createElementRenderer):
+ (WebCore::HTMLPlugInImageElement::didMoveToNewDocument):
+ (WebCore::HTMLPlugInImageElement::prepareForDocumentSuspension):
+ (WebCore::HTMLPlugInImageElement::resumeFromDocumentSuspension):
+ (WebCore::HTMLPlugInImageElement::documentWillSuspendForPageCache): Deleted.
+ (WebCore::HTMLPlugInImageElement::documentDidResumeFromPageCache): Deleted.
+ * html/HTMLPlugInImageElement.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * svg/SVGSVGElement.cpp:
+ (WebCore::SVGSVGElement::SVGSVGElement):
+ (WebCore::SVGSVGElement::~SVGSVGElement):
+ (WebCore::SVGSVGElement::didMoveToNewDocument):
+ (WebCore::SVGSVGElement::prepareForDocumentSuspension):
+ (WebCore::SVGSVGElement::resumeFromDocumentSuspension):
+ (WebCore::SVGSVGElement::documentWillSuspendForPageCache): Deleted.
+ (WebCore::SVGSVGElement::documentDidResumeFromPageCache): Deleted.
+ * svg/SVGSVGElement.h:
+
</ins><span class="cx"> 2015-11-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the Windows build.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -4504,12 +4504,12 @@
</span><span class="cx"> renderView()->setIsInWindow(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::documentWillSuspendForPageCache()
</del><ins>+void Document::suspend()
</ins><span class="cx"> {
</span><span class="cx"> documentWillBecomeInactive();
</span><span class="cx">
</span><span class="cx"> for (auto* element : m_documentSuspensionCallbackElements)
</span><del>- element->documentWillSuspendForPageCache();
</del><ins>+ element->prepareForDocumentSuspension();
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> // Clear the update flag to be able to check if the viewport arguments update
</span><span class="lines">@@ -4523,12 +4523,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::documentDidResumeFromPageCache()
</del><ins>+void Document::resume()
</ins><span class="cx"> {
</span><span class="cx"> Vector<Element*> elements;
</span><span class="cx"> copyToVector(m_documentSuspensionCallbackElements, elements);
</span><span class="cx"> for (auto* element : elements)
</span><del>- element->documentDidResumeFromPageCache();
</del><ins>+ element->resumeFromDocumentSuspension();
</ins><span class="cx">
</span><span class="cx"> if (renderView())
</span><span class="cx"> renderView()->setIsInWindow(true);
</span><span class="lines">@@ -4540,12 +4540,12 @@
</span><span class="cx"> m_frame->loader().client().dispatchDidBecomeFrameset(isFrameSet());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::registerForPageCacheSuspensionCallbacks(Element* e)
</del><ins>+void Document::registerForDocumentSuspensionCallbacks(Element* e)
</ins><span class="cx"> {
</span><span class="cx"> m_documentSuspensionCallbackElements.add(e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::unregisterForPageCacheSuspensionCallbacks(Element* e)
</del><ins>+void Document::unregisterForDocumentSuspensionCallbacks(Element* e)
</ins><span class="cx"> {
</span><span class="cx"> m_documentSuspensionCallbackElements.remove(e);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/dom/Document.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -1002,14 +1002,14 @@
</span><span class="cx"> bool inPageCache() const { return m_inPageCache; }
</span><span class="cx"> void setInPageCache(bool flag);
</span><span class="cx">
</span><del>- // Elements can register themselves for the "documentWillSuspendForPageCache()" and
- // "documentDidResumeFromPageCache()" callbacks
- void registerForPageCacheSuspensionCallbacks(Element*);
- void unregisterForPageCacheSuspensionCallbacks(Element*);
</del><ins>+ // Elements can register themselves for the "suspend()" and
+ // "resume()" callbacks
+ void registerForDocumentSuspensionCallbacks(Element*);
+ void unregisterForDocumentSuspensionCallbacks(Element*);
</ins><span class="cx">
</span><span class="cx"> void documentWillBecomeInactive();
</span><del>- void documentWillSuspendForPageCache();
- void documentDidResumeFromPageCache();
</del><ins>+ void suspend();
+ void resume();
</ins><span class="cx">
</span><span class="cx"> void registerForMediaVolumeCallbacks(Element*);
</span><span class="cx"> void unregisterForMediaVolumeCallbacks(Element*);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/dom/Element.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -346,8 +346,8 @@
</span><span class="cx"> void setMinimumSizeForResizing(const LayoutSize&);
</span><span class="cx">
</span><span class="cx"> // Use Document::registerForDocumentActivationCallbacks() to subscribe to these
</span><del>- virtual void documentWillSuspendForPageCache() { }
- virtual void documentDidResumeFromPageCache() { }
</del><ins>+ virtual void prepareForDocumentSuspension() { }
+ virtual void resumeFromDocumentSuspension() { }
</ins><span class="cx">
</span><span class="cx"> // Use Document::registerForMediaVolumeCallbacks() to subscribe to this
</span><span class="cx"> virtual void mediaVolumeDidChange() { }
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> m_document->page()->chrome().client().needTouchEvents(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_document->documentDidResumeFromPageCache();
</del><ins>+ m_document->resume();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedFrame::CachedFrame(Frame& frame)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> // but after we've fired the pagehide event, in case that creates more objects.
</span><span class="cx"> // Suspending must also happen after we've recursed over child frames, in case
</span><span class="cx"> // those create more objects.
</span><del>- m_document->documentWillSuspendForPageCache();
</del><ins>+ m_document->suspend();
</ins><span class="cx"> m_document->suspendScriptedAnimationControllerCallbacks();
</span><span class="cx"> m_document->suspendActiveDOMObjects(ActiveDOMObject::PageCache);
</span><span class="cx"> m_cachedFrameScriptData = std::make_unique<ScriptCachedFrameData>(frame);
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> frame.view()->clearScrollableAreas();
</span><span class="cx">
</span><del>- // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
</del><ins>+ // suspend() can set up a layout timer on the FrameView, so clear timers after that.
</ins><span class="cx"> frame.clearTimers();
</span><span class="cx">
</span><span class="cx"> // Deconstruct the FrameTree, to restore it later.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().formController().willDeleteForm(this);
</span><span class="cx"> if (!shouldAutocomplete())
</span><del>- document().unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx">
</span><span class="cx"> for (auto& associatedElement : m_associatedElements)
</span><span class="cx"> associatedElement->formWillBeDestroyed();
</span><span class="lines">@@ -492,9 +492,9 @@
</span><span class="cx"> m_attributes.setAcceptCharset(value);
</span><span class="cx"> else if (name == autocompleteAttr) {
</span><span class="cx"> if (!shouldAutocomplete())
</span><del>- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> else
</span><del>- document().unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="lines">@@ -810,7 +810,7 @@
</span><span class="cx"> return namedItems;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLFormElement::documentDidResumeFromPageCache()
</del><ins>+void HTMLFormElement::resumeFromDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!shouldAutocomplete());
</span><span class="cx">
</span><span class="lines">@@ -824,8 +824,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!shouldAutocomplete()) {
</span><span class="cx"> if (oldDocument)
</span><del>- oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ oldDocument->unregisterForDocumentSuspensionCallbacks(this);
+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLElement::didMoveToNewDocument(oldDocument);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx"> virtual bool isURLAttribute(const Attribute&) const override;
</span><span class="cx">
</span><del>- virtual void documentDidResumeFromPageCache() override;
</del><ins>+ virtual void resumeFromDocumentSuspension() override;
</ins><span class="cx">
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> HTMLInputElement::~HTMLInputElement()
</span><span class="cx"> {
</span><span class="cx"> if (needsSuspensionCallback())
</span><del>- document().unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx">
</span><span class="cx"> // Need to remove form association while this is still an HTMLInputElement
</span><span class="cx"> // so that virtual functions are called correctly.
</span><span class="lines">@@ -1399,13 +1399,13 @@
</span><span class="cx"> void HTMLInputElement::registerForSuspensionCallbackIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> if (needsSuspensionCallback())
</span><del>- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::unregisterForSuspensionCallbackIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> if (!needsSuspensionCallback())
</span><del>- document().unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLInputElement::isRequiredFormControl() const
</span><span class="lines">@@ -1431,12 +1431,12 @@
</span><span class="cx"> dispatchEvent(Event::create(eventNames().searchEvent, true, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::documentDidResumeFromPageCache()
</del><ins>+void HTMLInputElement::resumeFromDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(needsSuspensionCallback());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><del>- // <input type=color> uses documentWillSuspendForPageCache to detach the color picker UI,
</del><ins>+ // <input type=color> uses prepareForDocumentSuspension to detach the color picker UI,
</ins><span class="cx"> // so it should not be reset when being loaded from page cache.
</span><span class="cx"> if (isColorControl())
</span><span class="cx"> return;
</span><span class="lines">@@ -1445,7 +1445,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><del>-void HTMLInputElement::documentWillSuspendForPageCache()
</del><ins>+void HTMLInputElement::prepareForDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> if (!isColorControl())
</span><span class="cx"> return;
</span><span class="lines">@@ -1502,7 +1502,7 @@
</span><span class="cx"> if (oldDocument) {
</span><span class="cx"> // Always unregister for cache callbacks when leaving a document, even if we would otherwise like to be registered
</span><span class="cx"> if (needsSuspensionCallback)
</span><del>- oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ oldDocument->unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> if (isRadioButton())
</span><span class="cx"> oldDocument->formController().checkedRadioButtons().removeButton(this);
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="lines">@@ -1512,7 +1512,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (needsSuspensionCallback)
</span><del>- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (m_hasTouchEventHandler)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -376,9 +376,9 @@
</span><span class="cx"> virtual bool isInRange() const override final;
</span><span class="cx"> virtual bool isOutOfRange() const override final;
</span><span class="cx">
</span><del>- virtual void documentDidResumeFromPageCache() override final;
</del><ins>+ virtual void resumeFromDocumentSuspension() override final;
</ins><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><del>- virtual void documentWillSuspendForPageCache() override final;
</del><ins>+ virtual void prepareForDocumentSuspension() override final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const override final;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- document.registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ document.registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> document.registerForAllowsMediaDocumentInlinePlaybackChangedCallbacks(*this);
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- document.unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document.unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> document.unregisterForAllowsMediaDocumentInlinePlaybackChangedCallbacks(*this);
</span><span class="lines">@@ -605,12 +605,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-void HTMLMediaElement::documentWillSuspendForPageCache()
</del><ins>+void HTMLMediaElement::prepareForDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> m_mediaSession->unregisterWithDocument(document());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::documentDidResumeFromPageCache()
</del><ins>+void HTMLMediaElement::resumeFromDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> m_mediaSession->registerWithDocument(document());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -747,8 +747,8 @@
</span><span class="cx"> void updateCaptionContainer();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- virtual void documentWillSuspendForPageCache() override final;
- virtual void documentDidResumeFromPageCache() override final;
</del><ins>+ virtual void prepareForDocumentSuspension() override final;
+ virtual void resumeFromDocumentSuspension() override final;
</ins><span class="cx">
</span><span class="cx"> enum class UpdateMediaState {
</span><span class="cx"> Asynchronously,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> HTMLPlugInImageElement::~HTMLPlugInImageElement()
</span><span class="cx"> {
</span><span class="cx"> if (m_needsDocumentActivationCallbacks)
</span><del>- document().unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::setDisplayState(DisplayState state)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> // inactive or reactivates so it can clear the renderer before going into the page cache.
</span><span class="cx"> if (!m_needsDocumentActivationCallbacks) {
</span><span class="cx"> m_needsDocumentActivationCallbacks = true;
</span><del>- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (displayState() == DisplayingSnapshot) {
</span><span class="lines">@@ -301,8 +301,8 @@
</span><span class="cx"> void HTMLPlugInImageElement::didMoveToNewDocument(Document* oldDocument)
</span><span class="cx"> {
</span><span class="cx"> if (m_needsDocumentActivationCallbacks) {
</span><del>- oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ oldDocument->unregisterForDocumentSuspensionCallbacks(this);
+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_imageLoader)
</span><span class="lines">@@ -311,19 +311,19 @@
</span><span class="cx"> HTMLPlugInElement::didMoveToNewDocument(oldDocument);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::documentWillSuspendForPageCache()
</del><ins>+void HTMLPlugInImageElement::prepareForDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> if (renderer())
</span><span class="cx"> Style::detachRenderTree(*this);
</span><span class="cx">
</span><del>- HTMLPlugInElement::documentWillSuspendForPageCache();
</del><ins>+ HTMLPlugInElement::prepareForDocumentSuspension();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::documentDidResumeFromPageCache()
</del><ins>+void HTMLPlugInImageElement::resumeFromDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx">
</span><del>- HTMLPlugInElement::documentDidResumeFromPageCache();
</del><ins>+ HTMLPlugInElement::resumeFromDocumentSuspension();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::startLoadingImage()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx"> virtual void didAttachRenderers() override final;
</span><span class="cx"> virtual void willDetachRenderers() override final;
</span><span class="cx">
</span><del>- virtual void documentWillSuspendForPageCache() override final;
- virtual void documentDidResumeFromPageCache() override final;
</del><ins>+ virtual void prepareForDocumentSuspension() override final;
+ virtual void resumeFromDocumentSuspension() override final;
</ins><span class="cx">
</span><span class="cx"> virtual void defaultEventHandler(Event*) override final;
</span><span class="cx"> virtual void dispatchPendingMouseClick() override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -1820,7 +1820,7 @@
</span><span class="cx"> if (m_frame.document()->doctype() && m_frame.page())
</span><span class="cx"> m_frame.page()->chrome().didReceiveDocType(&m_frame);
</span><span class="cx"> #endif
</span><del>- m_frame.document()->documentDidResumeFromPageCache();
</del><ins>+ m_frame.document()->resume();
</ins><span class="cx">
</span><span class="cx"> // Force a layout to update view size and thereby update scrollbars.
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGSVGElement.cpp (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGSVGElement.cpp 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/svg/SVGSVGElement.cpp 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(SVGNames::svgTag));
</span><span class="cx"> registerAnimatedPropertiesForSVGSVGElement();
</span><del>- document.registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ document.registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<SVGSVGElement> SVGSVGElement::create(const QualifiedName& tagName, Document& document)
</span><span class="lines">@@ -85,15 +85,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_viewSpec)
</span><span class="cx"> m_viewSpec->resetContextElement();
</span><del>- document().unregisterForPageCacheSuspensionCallbacks(this);
</del><ins>+ document().unregisterForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> document().accessSVGExtensions().removeTimeContainer(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGSVGElement::didMoveToNewDocument(Document* oldDocument)
</span><span class="cx"> {
</span><span class="cx"> if (oldDocument)
</span><del>- oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
- document().registerForPageCacheSuspensionCallbacks(this);
</del><ins>+ oldDocument->unregisterForDocumentSuspensionCallbacks(this);
+ document().registerForDocumentSuspensionCallbacks(this);
</ins><span class="cx"> SVGGraphicsElement::didMoveToNewDocument(oldDocument);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -658,12 +658,12 @@
</span><span class="cx"> view.setZoomAndPanBaseValue(zoomAndPan());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGSVGElement::documentWillSuspendForPageCache()
</del><ins>+void SVGSVGElement::prepareForDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> pauseAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGSVGElement::documentDidResumeFromPageCache()
</del><ins>+void SVGSVGElement::resumeFromDocumentSuspension()
</ins><span class="cx"> {
</span><span class="cx"> unpauseAnimations();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGSVGElement.h (192710 => 192711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGSVGElement.h 2015-11-21 00:20:53 UTC (rev 192710)
+++ trunk/Source/WebCore/svg/SVGSVGElement.h 2015-11-21 01:42:11 UTC (rev 192711)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> virtual void removedFrom(ContainerNode&) override;
</span><span class="cx"> virtual void svgAttributeChanged(const QualifiedName&) override;
</span><span class="cx"> virtual bool selfHasRelativeLengths() const override;
</span><del>- virtual void documentWillSuspendForPageCache() override;
- virtual void documentDidResumeFromPageCache() override;
</del><ins>+ virtual void prepareForDocumentSuspension() override;
+ virtual void resumeFromDocumentSuspension() override;
</ins><span class="cx"> virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const override;
</span><span class="cx">
</span><span class="cx"> Frame* frameForCurrentScale() const;
</span></span></pre>
</div>
</div>
</body>
</html>