<!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>[185037] 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/185037">185037</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-30 22:53:06 -0700 (Sat, 30 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make FrameLoader methods that take PassRefPtr<Event> take raw pointers instead.
https://bugs.webkit.org/show_bug.cgi?id=145495
Reviewed by Alexey Proskuryakov.
Source/WebCore:
No new tests (No change in behavior).
In most cases ownership of the Event is not actually being transferred, and these functions are all rarely called anyways.
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::handleClick):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::urlSelected):
(WebCore::FrameLoader::loadFrameRequest):
(WebCore::FrameLoader::loadURL):
(WebCore::FrameLoader::loadPostRequest):
* loader/FrameLoader.h:
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::navigateToPDFLinkWithSimulatedClick):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185036 => 185037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-31 02:25:56 UTC (rev 185036)
+++ trunk/Source/WebCore/ChangeLog 2015-05-31 05:53:06 UTC (rev 185037)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-05-30 Brady Eidson <beidson@apple.com>
+
+ Make FrameLoader methods that take PassRefPtr<Event> take raw pointers instead.
+ https://bugs.webkit.org/show_bug.cgi?id=145495
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests (No change in behavior).
+
+ In most cases ownership of the Event is not actually being transferred, and these functions are all rarely called anyways.
+
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::handleClick):
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::urlSelected):
+ (WebCore::FrameLoader::loadFrameRequest):
+ (WebCore::FrameLoader::loadURL):
+ (WebCore::FrameLoader::loadPostRequest):
+ * loader/FrameLoader.h:
+
</ins><span class="cx"> 2015-05-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Tiling coverage sometimes inflated by outdated scale factor.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (185036 => 185037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-05-31 02:25:56 UTC (rev 185036)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-05-31 05:53:06 UTC (rev 185037)
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> Frame* frame = document().frame();
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><del>- frame->loader().urlSelected(url, target(), PassRefPtr<Event>(&event), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
</del><ins>+ frame->loader().urlSelected(url, target(), &event, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL HTMLLinkElement::href() const
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (185036 => 185037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-05-31 02:25:56 UTC (rev 185036)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-05-31 05:53:06 UTC (rev 185037)
</span><span class="lines">@@ -317,14 +317,14 @@
</span><span class="cx"> urlSelected(request, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, PassRefPtr<Event> triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer)
</del><ins>+void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer)
</ins><span class="cx"> {
</span><span class="cx"> NewFrameOpenerPolicy newFrameOpenerPolicy = shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow;
</span><span class="cx">
</span><span class="cx"> urlSelected(FrameLoadRequest(m_frame.document()->securityOrigin(), ResourceRequest(url), passedTarget, lockHistory, lockBackForwardList, shouldSendReferrer, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, DoNotReplaceDocumentIfJavaScriptURL), triggeringEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::urlSelected(const FrameLoadRequest& passedRequest, PassRefPtr<Event> triggeringEvent)
</del><ins>+void FrameLoader::urlSelected(const FrameLoadRequest& passedRequest, Event* triggeringEvent)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx"> FrameLoadRequest frameRequest(passedRequest);
</span><span class="lines">@@ -1141,7 +1141,7 @@
</span><span class="cx"> detachChildren();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, PassRefPtr<Event> event, PassRefPtr<FormState> formState)
</del><ins>+void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, Event* event, PassRefPtr<FormState> formState)
</ins><span class="cx"> {
</span><span class="cx"> // Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="lines">@@ -1187,7 +1187,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::loadURL(const FrameLoadRequest& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState)
</del><ins>+void FrameLoader::loadURL(const FrameLoadRequest& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, Event* event, PassRefPtr<FormState> prpFormState)
</ins><span class="cx"> {
</span><span class="cx"> if (m_inStopAllLoaders)
</span><span class="cx"> return;
</span><span class="lines">@@ -1230,7 +1230,7 @@
</span><span class="cx"> if (m_pageDismissalEventBeingDispatched != NoDismissal)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NavigationAction action(request, newLoadType, isFormSubmission, event.get());
</del><ins>+ NavigationAction action(request, newLoadType, isFormSubmission, event);
</ins><span class="cx">
</span><span class="cx"> if (!targetFrame && !frameName.isEmpty()) {
</span><span class="cx"> policyChecker().checkNewWindowPolicy(action, request, formState.release(), frameName, [this, allowNavigationToInvalidURL, openerPolicy](const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, const NavigationAction& action, bool shouldContinue) {
</span><span class="lines">@@ -2618,7 +2618,7 @@
</span><span class="cx"> request.setHTTPOrigin(origin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::loadPostRequest(const FrameLoadRequest& request, const String& referrer, FrameLoadType loadType, PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState)
</del><ins>+void FrameLoader::loadPostRequest(const FrameLoadRequest& request, const String& referrer, FrameLoadType loadType, Event* event, PassRefPtr<FormState> prpFormState)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<FormState> formState = prpFormState;
</span><span class="cx">
</span><span class="lines">@@ -2643,7 +2643,7 @@
</span><span class="cx"> workingResourceRequest.setHTTPContentType(contentType);
</span><span class="cx"> addExtraFieldsToRequest(workingResourceRequest, loadType, true);
</span><span class="cx">
</span><del>- NavigationAction action(workingResourceRequest, loadType, true, event.get());
</del><ins>+ NavigationAction action(workingResourceRequest, loadType, true, event);
</ins><span class="cx">
</span><span class="cx"> if (!frameName.isEmpty()) {
</span><span class="cx"> // The search for a target frame is done earlier in the case of form submission.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (185036 => 185037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2015-05-31 02:25:56 UTC (rev 185036)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2015-05-31 05:53:06 UTC (rev 185037)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: These are all functions which start loads. We have too many.
</span><span class="cx"> WEBCORE_EXPORT void loadURLIntoChildFrame(const URL&, const String& referer, Frame*);
</span><del>- WEBCORE_EXPORT void loadFrameRequest(const FrameLoadRequest&, PassRefPtr<Event>, PassRefPtr<FormState>); // Called by submitForm, calls loadPostRequest and loadURL.
</del><ins>+ WEBCORE_EXPORT void loadFrameRequest(const FrameLoadRequest&, Event*, PassRefPtr<FormState>); // Called by submitForm, calls loadPostRequest and loadURL.
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void load(const FrameLoadRequest&);
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>& data);
</span><span class="cx">
</span><span class="cx"> void changeLocation(const FrameLoadRequest&);
</span><del>- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, PassRefPtr<Event>, LockHistory, LockBackForwardList, ShouldSendReferrer);
</del><ins>+ WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer);
</ins><span class="cx"> void submitForm(PassRefPtr<FormSubmission>);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void reload(bool endToEndReload = false);
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx">
</span><span class="cx"> void dispatchDidCommitLoad();
</span><span class="cx">
</span><del>- void urlSelected(const FrameLoadRequest&, PassRefPtr<Event>);
</del><ins>+ void urlSelected(const FrameLoadRequest&, Event*);
</ins><span class="cx">
</span><span class="cx"> void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, PassRefPtr<FormState>, AllowNavigationToInvalidURL); // Calls continueLoadAfterNavigationPolicy
</span><span class="cx"> void load(DocumentLoader*); // Calls loadWithDocumentLoader
</span><span class="lines">@@ -352,8 +352,8 @@
</span><span class="cx"> void loadWithNavigationAction(const ResourceRequest&, const NavigationAction&, // Calls loadWithDocumentLoader
</span><span class="cx"> LockHistory, FrameLoadType, PassRefPtr<FormState>, AllowNavigationToInvalidURL);
</span><span class="cx">
</span><del>- void loadPostRequest(const FrameLoadRequest&, const String& referrer, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>);
- void loadURL(const FrameLoadRequest&, const String& referrer, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>);
</del><ins>+ void loadPostRequest(const FrameLoadRequest&, const String& referrer, FrameLoadType, Event*, PassRefPtr<FormState>);
+ void loadURL(const FrameLoadRequest&, const String& referrer, FrameLoadType, Event*, PassRefPtr<FormState>);
</ins><span class="cx">
</span><span class="cx"> bool shouldReload(const URL& currentURL, const URL& destinationURL);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185036 => 185037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-31 02:25:56 UTC (rev 185036)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-31 05:53:06 UTC (rev 185037)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-30 Brady Eidson <beidson@apple.com>
+
+ Make FrameLoader methods that take PassRefPtr<Event> take raw pointers instead.
+ https://bugs.webkit.org/show_bug.cgi?id=145495
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::navigateToPDFLinkWithSimulatedClick):
+
</ins><span class="cx"> 2015-05-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Crash closing a related tab with Web Inspector open while page is refreshing
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185036 => 185037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-31 02:25:56 UTC (rev 185036)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-31 05:53:06 UTC (rev 185037)
</span><span class="lines">@@ -1108,7 +1108,7 @@
</span><span class="cx">
</span><span class="cx"> const int singleClick = 1;
</span><span class="cx"> RefPtr<MouseEvent> mouseEvent = MouseEvent::create(eventNames().clickEvent, true, true, currentTime(), nullptr, singleClick, screenPoint.x(), screenPoint.y(), documentPoint.x(), documentPoint.y(), false, false, false, false, 0, nullptr, 0, nullptr);
</span><del>- mainFrame->loader().urlSelected(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.release(), LockHistory::No, LockBackForwardList::No, ShouldSendReferrer::MaybeSendReferrer);
</del><ins>+ mainFrame->loader().urlSelected(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.get(), LockHistory::No, LockBackForwardList::No, ShouldSendReferrer::MaybeSendReferrer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::stopLoadingFrame(uint64_t frameID)
</span></span></pre>
</div>
</div>
</body>
</html>