Diff
Modified: trunk/Source/WebCore/ChangeLog (185036 => 185037)
--- 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)
@@ -1,3 +1,24 @@
+2015-05-30 Brady Eidson <beid...@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:
+
2015-05-30 Andreas Kling <akl...@apple.com>
[iOS] Tiling coverage sometimes inflated by outdated scale factor.
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (185036 => 185037)
--- 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)
@@ -441,7 +441,7 @@
Frame* frame = document().frame();
if (!frame)
return;
- frame->loader().urlSelected(url, target(), PassRefPtr<Event>(&event), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
+ frame->loader().urlSelected(url, target(), &event, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
}
URL HTMLLinkElement::href() const
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (185036 => 185037)
--- 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)
@@ -317,14 +317,14 @@
urlSelected(request, nullptr);
}
-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, PassRefPtr<Event> triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer)
+void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer)
{
NewFrameOpenerPolicy newFrameOpenerPolicy = shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow;
urlSelected(FrameLoadRequest(m_frame.document()->securityOrigin(), ResourceRequest(url), passedTarget, lockHistory, lockBackForwardList, shouldSendReferrer, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, DoNotReplaceDocumentIfJavaScriptURL), triggeringEvent);
}
-void FrameLoader::urlSelected(const FrameLoadRequest& passedRequest, PassRefPtr<Event> triggeringEvent)
+void FrameLoader::urlSelected(const FrameLoadRequest& passedRequest, Event* triggeringEvent)
{
Ref<Frame> protect(m_frame);
FrameLoadRequest frameRequest(passedRequest);
@@ -1141,7 +1141,7 @@
detachChildren();
}
-void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, PassRefPtr<Event> event, PassRefPtr<FormState> formState)
+void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, Event* event, PassRefPtr<FormState> formState)
{
// Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
Ref<Frame> protect(m_frame);
@@ -1187,7 +1187,7 @@
}
}
-void FrameLoader::loadURL(const FrameLoadRequest& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState)
+void FrameLoader::loadURL(const FrameLoadRequest& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, Event* event, PassRefPtr<FormState> prpFormState)
{
if (m_inStopAllLoaders)
return;
@@ -1230,7 +1230,7 @@
if (m_pageDismissalEventBeingDispatched != NoDismissal)
return;
- NavigationAction action(request, newLoadType, isFormSubmission, event.get());
+ NavigationAction action(request, newLoadType, isFormSubmission, event);
if (!targetFrame && !frameName.isEmpty()) {
policyChecker().checkNewWindowPolicy(action, request, formState.release(), frameName, [this, allowNavigationToInvalidURL, openerPolicy](const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, const NavigationAction& action, bool shouldContinue) {
@@ -2618,7 +2618,7 @@
request.setHTTPOrigin(origin);
}
-void FrameLoader::loadPostRequest(const FrameLoadRequest& request, const String& referrer, FrameLoadType loadType, PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState)
+void FrameLoader::loadPostRequest(const FrameLoadRequest& request, const String& referrer, FrameLoadType loadType, Event* event, PassRefPtr<FormState> prpFormState)
{
RefPtr<FormState> formState = prpFormState;
@@ -2643,7 +2643,7 @@
workingResourceRequest.setHTTPContentType(contentType);
addExtraFieldsToRequest(workingResourceRequest, loadType, true);
- NavigationAction action(workingResourceRequest, loadType, true, event.get());
+ NavigationAction action(workingResourceRequest, loadType, true, event);
if (!frameName.isEmpty()) {
// The search for a target frame is done earlier in the case of form submission.
Modified: trunk/Source/WebCore/loader/FrameLoader.h (185036 => 185037)
--- 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)
@@ -109,7 +109,7 @@
// FIXME: These are all functions which start loads. We have too many.
WEBCORE_EXPORT void loadURLIntoChildFrame(const URL&, const String& referer, Frame*);
- WEBCORE_EXPORT void loadFrameRequest(const FrameLoadRequest&, PassRefPtr<Event>, PassRefPtr<FormState>); // Called by submitForm, calls loadPostRequest and loadURL.
+ WEBCORE_EXPORT void loadFrameRequest(const FrameLoadRequest&, Event*, PassRefPtr<FormState>); // Called by submitForm, calls loadPostRequest and loadURL.
WEBCORE_EXPORT void load(const FrameLoadRequest&);
@@ -119,7 +119,7 @@
unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>& data);
void changeLocation(const FrameLoadRequest&);
- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, PassRefPtr<Event>, LockHistory, LockBackForwardList, ShouldSendReferrer);
+ WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer);
void submitForm(PassRefPtr<FormSubmission>);
WEBCORE_EXPORT void reload(bool endToEndReload = false);
@@ -344,7 +344,7 @@
void dispatchDidCommitLoad();
- void urlSelected(const FrameLoadRequest&, PassRefPtr<Event>);
+ void urlSelected(const FrameLoadRequest&, Event*);
void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, PassRefPtr<FormState>, AllowNavigationToInvalidURL); // Calls continueLoadAfterNavigationPolicy
void load(DocumentLoader*); // Calls loadWithDocumentLoader
@@ -352,8 +352,8 @@
void loadWithNavigationAction(const ResourceRequest&, const NavigationAction&, // Calls loadWithDocumentLoader
LockHistory, FrameLoadType, PassRefPtr<FormState>, AllowNavigationToInvalidURL);
- void loadPostRequest(const FrameLoadRequest&, const String& referrer, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>);
- void loadURL(const FrameLoadRequest&, const String& referrer, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>);
+ void loadPostRequest(const FrameLoadRequest&, const String& referrer, FrameLoadType, Event*, PassRefPtr<FormState>);
+ void loadURL(const FrameLoadRequest&, const String& referrer, FrameLoadType, Event*, PassRefPtr<FormState>);
bool shouldReload(const URL& currentURL, const URL& destinationURL);
Modified: trunk/Source/WebKit2/ChangeLog (185036 => 185037)
--- 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)
@@ -1,3 +1,13 @@
+2015-05-30 Brady Eidson <beid...@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):
+
2015-05-29 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Crash closing a related tab with Web Inspector open while page is refreshing
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185036 => 185037)
--- 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)
@@ -1108,7 +1108,7 @@
const int singleClick = 1;
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);
- mainFrame->loader().urlSelected(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.release(), LockHistory::No, LockBackForwardList::No, ShouldSendReferrer::MaybeSendReferrer);
+ mainFrame->loader().urlSelected(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.get(), LockHistory::No, LockBackForwardList::No, ShouldSendReferrer::MaybeSendReferrer);
}
void WebPage::stopLoadingFrame(uint64_t frameID)
