<!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>[192342] trunk/Source</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/192342">192342</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-11-11 17:48:27 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename handle.*Event to dispatch.*Event
https://bugs.webkit.org/show_bug.cgi?id=151168
Reviewed by Chris Dumez.
Source/WebCore:
* dom/Document.cpp:
(WebCore::Document::implicitClose):
* dom/Document.h:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::DocumentLoader):
(WebCore::DocumentLoader::getIconDataForIconURL):
(WebCore::DocumentLoader::dispatchOnloadEvents):
(WebCore::DocumentLoader::handledOnloadEvents): Deleted.
* loader/DocumentLoader.h:
(WebCore::DocumentLoader::isClientRedirect):
(WebCore::DocumentLoader::setIsClientRedirect):
(WebCore::DocumentLoader::wasOnloadDispatched):
(WebCore::DocumentLoader::overrideEncoding):
(WebCore::DocumentLoader::wasOnloadHandled): Deleted.
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::submitForm):
(WebCore::FrameLoader::stopLoading):
(WebCore::FrameLoader::userAgent):
(WebCore::FrameLoader::dispatchOnloadEvents):
(WebCore::FrameLoader::frameDetached):
(WebCore::FrameLoader::shouldClose):
(WebCore::FrameLoader::dispatchUnloadEvents):
(WebCore::FrameLoader::dispatchBeforeUnloadEvent):
(WebCore::FrameLoader::handledOnloadEvents): Deleted.
(WebCore::FrameLoader::handleUnloadEvents): Deleted.
(WebCore::FrameLoader::handleBeforeUnloadEvent): Deleted.
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:
* loader/NavigationScheduler.cpp:
(WebCore::NavigationScheduler::mustLockBackForwardList):
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidFailLoading):
(WebFrameLoaderClient::dispatchDidDispatchOnloadEvents):
(WebFrameLoaderClient::dispatchDidHandleOnloadEvents): Deleted.
Source/WebKit/win:
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::shouldCacheResponse):
(WebFrameLoaderClient::dispatchDidDispatchOnloadEvents):
(WebFrameLoaderClient::dispatchDidHandleOnloadEvents): Deleted.
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache):
(WebKit::WebFrameLoaderClient::dispatchDidDispatchOnloadEvents):
(WebKit::WebFrameLoaderClient::dispatchDidHandleOnloadEvents): Deleted.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.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="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/ChangeLog 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-11-11 Geoffrey Garen <ggaren@apple.com>
+
+ Rename handle.*Event to dispatch.*Event
+ https://bugs.webkit.org/show_bug.cgi?id=151168
+
+ Reviewed by Chris Dumez.
+
+ * dom/Document.cpp:
+ (WebCore::Document::implicitClose):
+ * dom/Document.h:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::DocumentLoader):
+ (WebCore::DocumentLoader::getIconDataForIconURL):
+ (WebCore::DocumentLoader::dispatchOnloadEvents):
+ (WebCore::DocumentLoader::handledOnloadEvents): Deleted.
+ * loader/DocumentLoader.h:
+ (WebCore::DocumentLoader::isClientRedirect):
+ (WebCore::DocumentLoader::setIsClientRedirect):
+ (WebCore::DocumentLoader::wasOnloadDispatched):
+ (WebCore::DocumentLoader::overrideEncoding):
+ (WebCore::DocumentLoader::wasOnloadHandled): Deleted.
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::submitForm):
+ (WebCore::FrameLoader::stopLoading):
+ (WebCore::FrameLoader::userAgent):
+ (WebCore::FrameLoader::dispatchOnloadEvents):
+ (WebCore::FrameLoader::frameDetached):
+ (WebCore::FrameLoader::shouldClose):
+ (WebCore::FrameLoader::dispatchUnloadEvents):
+ (WebCore::FrameLoader::dispatchBeforeUnloadEvent):
+ (WebCore::FrameLoader::handledOnloadEvents): Deleted.
+ (WebCore::FrameLoader::handleUnloadEvents): Deleted.
+ (WebCore::FrameLoader::handleBeforeUnloadEvent): Deleted.
+ * loader/FrameLoader.h:
+ * loader/FrameLoaderClient.h:
+ * loader/NavigationScheduler.cpp:
+ (WebCore::NavigationScheduler::mustLockBackForwardList):
+
</ins><span class="cx"> 2015-11-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove more dead code
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -2666,7 +2666,7 @@
</span><span class="cx"> enqueuePopstateEvent(m_pendingStateObject.release());
</span><span class="cx">
</span><span class="cx"> if (f)
</span><del>- f->loader().handledOnloadEvents();
</del><ins>+ f->loader().dispatchOnloadEvents();
</ins><span class="cx"> #ifdef INSTRUMENT_LAYOUT_SCHEDULING
</span><span class="cx"> if (!ownerElement())
</span><span class="cx"> printf("onload fired at %lld\n", elapsedTime().count());
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/dom/Document.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -1522,7 +1522,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Merge these 2 variables into an enum. Also, FrameLoader::m_didCallImplicitClose
</span><span class="cx"> // is almost a duplication of this data, so that should probably get merged in too.
</span><del>- // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadHandled are roughly the same
</del><ins>+ // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
</ins><span class="cx"> // and should be merged.
</span><span class="cx"> bool m_processingLoadEvent;
</span><span class="cx"> bool m_loadEventFinished;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> , m_gotFirstByte(false)
</span><span class="cx"> , m_isClientRedirect(false)
</span><span class="cx"> , m_isLoadingMultipartContent(false)
</span><del>- , m_wasOnloadHandled(false)
</del><ins>+ , m_wasOnloadDispatched(false)
</ins><span class="cx"> , m_stopRecordingResponses(false)
</span><span class="cx"> , m_substituteResourceDeliveryTimer(*this, &DocumentLoader::substituteResourceDeliveryTimerFired)
</span><span class="cx"> , m_didCreateGlobalHistoryEntry(false)
</span><span class="lines">@@ -1593,9 +1593,9 @@
</span><span class="cx"> iconDatabase().iconDataForIconURL(urlString, m_iconDataCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::handledOnloadEvents()
</del><ins>+void DocumentLoader::dispatchOnloadEvents()
</ins><span class="cx"> {
</span><del>- m_wasOnloadHandled = true;
</del><ins>+ m_wasOnloadDispatched = true;
</ins><span class="cx"> applicationCacheHost()->stopDeferringEvents();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx">
</span><span class="cx"> bool isClientRedirect() const { return m_isClientRedirect; }
</span><span class="cx"> void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isClientRedirect; }
</span><del>- void handledOnloadEvents();
- bool wasOnloadHandled() { return m_wasOnloadHandled; }
</del><ins>+ void dispatchOnloadEvents();
+ bool wasOnloadDispatched() { return m_wasOnloadDispatched; }
</ins><span class="cx"> WEBCORE_EXPORT bool isLoadingInAPISense() const;
</span><span class="cx"> WEBCORE_EXPORT void setTitle(const StringWithDirection&);
</span><span class="cx"> const String& overrideEncoding() const { return m_overrideEncoding; }
</span><span class="lines">@@ -386,9 +386,9 @@
</span><span class="cx"> bool m_isClientRedirect;
</span><span class="cx"> bool m_isLoadingMultipartContent;
</span><span class="cx">
</span><del>- // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadHandled are roughly the same
</del><ins>+ // FIXME: Document::m_processingLoadEvent and DocumentLoader::m_wasOnloadDispatched are roughly the same
</ins><span class="cx"> // and should be merged.
</span><del>- bool m_wasOnloadHandled;
</del><ins>+ bool m_wasOnloadDispatched;
</ins><span class="cx">
</span><span class="cx"> StringWithDirection m_pageTitle;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long, const ResourceError&) override { }
</span><span class="cx"> virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int) override { return false; }
</span><span class="cx">
</span><del>- virtual void dispatchDidHandleOnloadEvents() override { }
</del><ins>+ virtual void dispatchDidDispatchOnloadEvents() override { }
</ins><span class="cx"> virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() override { }
</span><span class="cx"> virtual void dispatchDidCancelClientRedirect() override { }
</span><span class="cx"> virtual void dispatchWillPerformClientRedirect(const URL&, double, double) override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx">
</span><span class="cx"> // We do not want to submit more than one form from the same page, nor do we want to submit a single
</span><span class="cx"> // form more than once. This flag prevents these from happening; not sure how other browsers prevent this.
</span><del>- // The flag is reset in each time we start handle a new mouse or key down event, and
</del><ins>+ // The flag is reset in each time we start dispatching a new mouse or key down event, and
</ins><span class="cx"> // also in setView since this part may get reused for a page from the back/forward cache.
</span><span class="cx"> // The form multi-submit logic here is only needed when we are submitting a form that affects this frame.
</span><span class="cx">
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> m_frame.document()->parser()->stopParsing();
</span><span class="cx">
</span><span class="cx"> if (unloadEventPolicy != UnloadEventPolicyNone)
</span><del>- handleUnloadEvents(unloadEventPolicy);
</del><ins>+ dispatchUnloadEvents(unloadEventPolicy);
</ins><span class="cx">
</span><span class="cx"> m_isComplete = true; // to avoid calling completed() in finishedParsing()
</span><span class="cx"> m_didCallImplicitClose = true; // don't want that one either
</span><span class="lines">@@ -2451,12 +2451,12 @@
</span><span class="cx"> return m_client.userAgent(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::handledOnloadEvents()
</del><ins>+void FrameLoader::dispatchOnloadEvents()
</ins><span class="cx"> {
</span><del>- m_client.dispatchDidHandleOnloadEvents();
</del><ins>+ m_client.dispatchDidDispatchOnloadEvents();
</ins><span class="cx">
</span><span class="cx"> if (documentLoader())
</span><del>- documentLoader()->handledOnloadEvents();
</del><ins>+ documentLoader()->dispatchOnloadEvents();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameLoader::frameDetached()
</span><span class="lines">@@ -2822,7 +2822,7 @@
</span><span class="cx"> for (i = 0; i < targetFrames.size(); i++) {
</span><span class="cx"> if (!targetFrames[i]->tree().isDescendantOf(&m_frame))
</span><span class="cx"> continue;
</span><del>- if (!targetFrames[i]->loader().handleBeforeUnloadEvent(page->chrome(), this))
</del><ins>+ if (!targetFrames[i]->loader().dispatchBeforeUnloadEvent(page->chrome(), this))
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2837,7 +2837,7 @@
</span><span class="cx"> return shouldClose;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::handleUnloadEvents(UnloadEventPolicy unloadEventPolicy)
</del><ins>+void FrameLoader::dispatchUnloadEvents(UnloadEventPolicy unloadEventPolicy)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_frame.document())
</span><span class="cx"> return;
</span><span class="lines">@@ -2895,7 +2895,7 @@
</span><span class="cx"> m_frame.document()->removeAllEventListeners();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FrameLoader::handleBeforeUnloadEvent(Chrome& chrome, FrameLoader* frameLoaderBeingNavigated)
</del><ins>+bool FrameLoader::dispatchBeforeUnloadEvent(Chrome& chrome, FrameLoader* frameLoaderBeingNavigated)
</ins><span class="cx"> {
</span><span class="cx"> DOMWindow* domWindow = m_frame.document()->domWindow();
</span><span class="cx"> if (!domWindow)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> void receivedFirstData();
</span><span class="cx">
</span><del>- void handledOnloadEvents();
</del><ins>+ void dispatchOnloadEvents();
</ins><span class="cx"> String userAgent(const URL&) const;
</span><span class="cx">
</span><span class="cx"> void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&);
</span><span class="lines">@@ -320,8 +320,8 @@
</span><span class="cx">
</span><span class="cx"> SubstituteData defaultSubstituteDataForURL(const URL&);
</span><span class="cx">
</span><del>- bool handleBeforeUnloadEvent(Chrome&, FrameLoader* frameLoaderBeingNavigated);
- void handleUnloadEvents(UnloadEventPolicy);
</del><ins>+ bool dispatchBeforeUnloadEvent(Chrome&, FrameLoader* frameLoaderBeingNavigated);
+ void dispatchUnloadEvents(UnloadEventPolicy);
</ins><span class="cx">
</span><span class="cx"> void continueLoadAfterNavigationPolicy(const ResourceRequest&, PassRefPtr<FormState>, bool shouldContinue, AllowNavigationToInvalidURL);
</span><span class="cx"> void continueLoadAfterNewWindowPolicy(const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, const NavigationAction&, bool shouldContinue, AllowNavigationToInvalidURL, NewFrameOpenerPolicy);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&) = 0;
</span><span class="cx"> virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0;
</span><span class="cx">
</span><del>- virtual void dispatchDidHandleOnloadEvents() = 0;
</del><ins>+ virtual void dispatchDidDispatchOnloadEvents() = 0;
</ins><span class="cx"> virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
</span><span class="cx"> virtual void dispatchDidChangeProvisionalURL() { }
</span><span class="cx"> virtual void dispatchDidCancelClientRedirect() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Non-user navigation before the page has finished firing onload should not create a new back/forward item.
</span><span class="cx"> // See https://webkit.org/b/42861 for the original motivation for this.
</span><del>- if (!ScriptController::processingUserGesture() && targetFrame.loader().documentLoader() && !targetFrame.loader().documentLoader()->wasOnloadHandled())
</del><ins>+ if (!ScriptController::processingUserGesture() && targetFrame.loader().documentLoader() && !targetFrame.loader().documentLoader()->wasOnloadDispatched())
</ins><span class="cx"> return LockBackForwardList::Yes;
</span><span class="cx">
</span><span class="cx"> // Navigation of a subframe during loading of an ancestor frame does not create a new back/forward item.
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-11 Geoffrey Garen <ggaren@apple.com>
+
+ Rename handle.*Event to dispatch.*Event
+ https://bugs.webkit.org/show_bug.cgi?id=151168
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidFailLoading):
+ (WebFrameLoaderClient::dispatchDidDispatchOnloadEvents):
+ (WebFrameLoaderClient::dispatchDidHandleOnloadEvents): Deleted.
+
</ins><span class="cx"> 2015-11-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove more dead context menu code
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const override;
</span><span class="cx">
</span><del>- virtual void dispatchDidHandleOnloadEvents() override;
</del><ins>+ virtual void dispatchDidDispatchOnloadEvents() override;
</ins><span class="cx"> virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
</span><span class="cx"> virtual void dispatchDidCancelClientRedirect() override;
</span><span class="cx"> virtual void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> static_cast<WebDocumentLoaderMac*>(loader)->decreaseLoadCount(identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidHandleOnloadEvents()
</del><ins>+void WebFrameLoaderClient::dispatchDidDispatchOnloadEvents()
</ins><span class="cx"> {
</span><span class="cx"> WebView *webView = getWebView(m_webFrame.get());
</span><span class="cx"> WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(webView);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit/win/ChangeLog 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-11 Geoffrey Garen <ggaren@apple.com>
+
+ Rename handle.*Event to dispatch.*Event
+ https://bugs.webkit.org/show_bug.cgi?id=151168
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::shouldCacheResponse):
+ (WebFrameLoaderClient::dispatchDidDispatchOnloadEvents):
+ (WebFrameLoaderClient::dispatchDidHandleOnloadEvents): Deleted.
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-11-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Handle custom menu items in WebKit instead of WebCore on Windows
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidHandleOnloadEvents()
</del><ins>+void WebFrameLoaderClient::dispatchDidDispatchOnloadEvents()
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx"> COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePriv;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
</span><span class="cx"> virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length);
</span><span class="cx">
</span><del>- virtual void dispatchDidHandleOnloadEvents() override;
</del><ins>+ virtual void dispatchDidDispatchOnloadEvents() override;
</ins><span class="cx"> virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
</span><span class="cx"> virtual void dispatchDidCancelClientRedirect() override;
</span><span class="cx"> virtual void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-11 Geoffrey Garen <ggaren@apple.com>
+
+ Rename handle.*Event to dispatch.*Event
+ https://bugs.webkit.org/show_bug.cgi?id=151168
+
+ Reviewed by Chris Dumez.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache):
+ (WebKit::WebFrameLoaderClient::dispatchDidDispatchOnloadEvents):
+ (WebKit::WebFrameLoaderClient::dispatchDidHandleOnloadEvents): Deleted.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-11-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix builds.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidHandleOnloadEvents()
</del><ins>+void WebFrameLoaderClient::dispatchDidDispatchOnloadEvents()
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (192341 => 192342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-11-12 01:47:04 UTC (rev 192341)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-11-12 01:48:27 UTC (rev 192342)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
</span><span class="cx"> virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length) override;
</span><span class="cx">
</span><del>- virtual void dispatchDidHandleOnloadEvents() override;
</del><ins>+ virtual void dispatchDidDispatchOnloadEvents() override;
</ins><span class="cx"> virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
</span><span class="cx"> virtual void dispatchDidChangeProvisionalURL() override;
</span><span class="cx"> virtual void dispatchDidCancelClientRedirect() override;
</span></span></pre>
</div>
</div>
</body>
</html>