Diff
Modified: trunk/Source/WebCore/ChangeLog (258139 => 258140)
--- trunk/Source/WebCore/ChangeLog 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/ChangeLog 2020-03-09 15:10:01 UTC (rev 258140)
@@ -1,3 +1,30 @@
+2020-03-09 Rob Buis <[email protected]>
+
+ Rename urlSelected to changeLocation
+ https://bugs.webkit.org/show_bug.cgi?id=208529
+
+ Reviewed by Darin Adler.
+
+ Rename urlSelected to changeLocation and remove the existing
+ changeLocation. The name changeLocation is more intuitive
+ than urlSelected.
+
+ No new tests -- no new or changed functionality.
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::handleClick):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::handleClick):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::changeLocation):
+ (WebCore::FrameLoader::urlSelected): Deleted.
+ * loader/FrameLoader.h:
+ * loader/NavigationScheduler.cpp:
+ * mathml/MathMLElement.cpp:
+ (WebCore::MathMLElement::defaultEventHandler):
+ * svg/SVGAElement.cpp:
+ (WebCore::SVGAElement::defaultEventHandler):
+
2020-03-09 youenn fablet <[email protected]>
Log error in clearNowPlayingInfo/setNowPlayingInfo
Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (258139 => 258140)
--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -508,7 +508,7 @@
// created. Thus, it should be empty for now.
ASSERT(!adClickAttribution || adClickAttribution->url().isNull());
- frame->loader().urlSelected(completedURL, effectiveTarget, &event, LockHistory::No, LockBackForwardList::No, referrerPolicy, document().shouldOpenExternalURLsPolicyToPropagate(), newFrameOpenerPolicy, downloadAttribute, systemPreviewInfo, WTFMove(adClickAttribution));
+ frame->loader().changeLocation(completedURL, effectiveTarget, &event, LockHistory::No, LockBackForwardList::No, referrerPolicy, document().shouldOpenExternalURLsPolicyToPropagate(), newFrameOpenerPolicy, downloadAttribute, systemPreviewInfo, WTFMove(adClickAttribution));
sendPings(completedURL);
}
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (258139 => 258140)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -586,7 +586,7 @@
RefPtr<Frame> frame = document().frame();
if (!frame)
return;
- frame->loader().urlSelected(url, target(), &event, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, document().shouldOpenExternalURLsPolicyToPropagate());
+ frame->loader().changeLocation(url, target(), &event, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, document().shouldOpenExternalURLsPolicyToPropagate());
}
URL HTMLLinkElement::href() const
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (258139 => 258140)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -416,23 +416,18 @@
client().dispatchDecidePolicyForResponse(response, activeDocumentLoader()->request(), identifier, activeDocumentLoader()->downloadAttribute(), WTFMove(function));
}
-void FrameLoader::changeLocation(FrameLoadRequest&& request)
+void FrameLoader::changeLocation(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, const ReferrerPolicy& referrerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> openerPolicy, const AtomString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo, Optional<AdClickAttribution>&& adClickAttribution)
{
- urlSelected(WTFMove(request), nullptr);
-}
-
-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, const ReferrerPolicy& referrerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> openerPolicy, const AtomString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo, Optional<AdClickAttribution>&& adClickAttribution)
-{
auto* frame = lexicalFrameFromCommonVM();
auto initiatedByMainFrame = frame && frame->isMainFrame() ? InitiatedByMainFrame::Yes : InitiatedByMainFrame::Unknown;
NewFrameOpenerPolicy newFrameOpenerPolicy = openerPolicy.valueOr(referrerPolicy == ReferrerPolicy::NoReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow);
- urlSelected(FrameLoadRequest(*m_frame.document(), m_frame.document()->securityOrigin(), { url }, passedTarget, lockHistory, lockBackForwardList, referrerPolicy, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, shouldOpenExternalURLsPolicy, initiatedByMainFrame, DoNotReplaceDocumentIfJavaScriptURL, downloadAttribute, systemPreviewInfo), triggeringEvent, WTFMove(adClickAttribution));
+ changeLocation(FrameLoadRequest(*m_frame.document(), m_frame.document()->securityOrigin(), { url }, passedTarget, lockHistory, lockBackForwardList, referrerPolicy, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, shouldOpenExternalURLsPolicy, initiatedByMainFrame, DoNotReplaceDocumentIfJavaScriptURL, downloadAttribute, systemPreviewInfo), triggeringEvent, WTFMove(adClickAttribution));
}
-void FrameLoader::urlSelected(FrameLoadRequest&& frameRequest, Event* triggeringEvent, Optional<AdClickAttribution>&& adClickAttribution)
+void FrameLoader::changeLocation(FrameLoadRequest&& frameRequest, Event* triggeringEvent, Optional<AdClickAttribution>&& adClickAttribution)
{
- FRAMELOADER_RELEASE_LOG_IF_ALLOWED(ResourceLoading, "urlSelected: frame load started");
+ FRAMELOADER_RELEASE_LOG_IF_ALLOWED(ResourceLoading, "changeLocation: frame load started");
Ref<Frame> protect(m_frame);
Modified: trunk/Source/WebCore/loader/FrameLoader.h (258139 => 258140)
--- trunk/Source/WebCore/loader/FrameLoader.h 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2020-03-09 15:10:01 UTC (rev 258140)
@@ -129,8 +129,8 @@
#endif
unsigned long loadResourceSynchronously(const ResourceRequest&, ClientCredentialPolicy, const FetchOptions&, const HTTPHeaderMap&, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>& data);
- void changeLocation(FrameLoadRequest&&);
- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, const ReferrerPolicy&, ShouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> = WTF::nullopt, const AtomString& downloadAttribute = nullAtom(), const SystemPreviewInfo& = { }, Optional<AdClickAttribution>&& = WTF::nullopt);
+ WEBCORE_EXPORT void changeLocation(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, const ReferrerPolicy&, ShouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> = WTF::nullopt, const AtomString& downloadAttribute = nullAtom(), const SystemPreviewInfo& = { }, Optional<AdClickAttribution>&& = WTF::nullopt);
+ void changeLocation(FrameLoadRequest&&, Event* = nullptr, Optional<AdClickAttribution>&& = WTF::nullopt);
void submitForm(Ref<FormSubmission>&&);
WEBCORE_EXPORT void reload(OptionSet<ReloadOption> = { });
@@ -386,8 +386,6 @@
void dispatchDidCommitLoad(Optional<HasInsecureContent> initialHasInsecureContent, Optional<UsedLegacyTLS> initialUsedLegacyTLS);
- void urlSelected(FrameLoadRequest&&, Event*, Optional<AdClickAttribution>&& = WTF::nullopt);
-
void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, RefPtr<FormState>&&, AllowNavigationToInvalidURL, ShouldTreatAsContinuingLoad, CompletionHandler<void()>&& = [] { }); // Calls continueLoadAfterNavigationPolicy
void load(DocumentLoader&); // Calls loadWithDocumentLoader
Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (258139 => 258140)
--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -254,7 +254,7 @@
if (!m_historySteps) {
// Special case for go(0) from a frame -> reload only the frame
// To follow Firefox and IE's behavior, history reload can only navigate the self frame.
- frame.loader().urlSelected(frame.document()->url(), "_self", 0, lockHistory(), lockBackForwardList(), ReferrerPolicy::EmptyString, shouldOpenExternalURLs());
+ frame.loader().changeLocation(frame.document()->url(), "_self", 0, lockHistory(), lockBackForwardList(), ReferrerPolicy::EmptyString, shouldOpenExternalURLs());
return;
}
Modified: trunk/Source/WebCore/mathml/MathMLElement.cpp (258139 => 258140)
--- trunk/Source/WebCore/mathml/MathMLElement.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/mathml/MathMLElement.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -192,7 +192,7 @@
const auto& url = ""
event.setDefaultHandled();
if (auto* frame = document().frame())
- frame->loader().urlSelected(document().completeURL(url), "_self", &event, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, document().shouldOpenExternalURLsPolicyToPropagate());
+ frame->loader().changeLocation(document().completeURL(url), "_self", &event, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, document().shouldOpenExternalURLsPolicyToPropagate());
return;
}
}
Modified: trunk/Source/WebCore/svg/SVGAElement.cpp (258139 => 258140)
--- trunk/Source/WebCore/svg/SVGAElement.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebCore/svg/SVGAElement.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -139,7 +139,7 @@
auto frame = makeRefPtr(document().frame());
if (!frame)
return;
- frame->loader().urlSelected(document().completeURL(url), target, &event, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, document().shouldOpenExternalURLsPolicyToPropagate());
+ frame->loader().changeLocation(document().completeURL(url), target, &event, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, document().shouldOpenExternalURLsPolicyToPropagate());
return;
}
}
Modified: trunk/Source/WebKit/ChangeLog (258139 => 258140)
--- trunk/Source/WebKit/ChangeLog 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebKit/ChangeLog 2020-03-09 15:10:01 UTC (rev 258140)
@@ -1,3 +1,19 @@
+2020-03-09 Rob Buis <[email protected]>
+
+ Rename urlSelected to changeLocation
+ https://bugs.webkit.org/show_bug.cgi?id=208529
+
+ Reviewed by Darin Adler.
+
+ Adapt to API change.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::clickedLink):
+ * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+ (WebKit::WebContextMenuClient::searchWithGoogle):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::navigateToPDFLinkWithSimulatedClick):
+
2020-03-09 Jer Noble <[email protected]>
Unreviewed build fix after r258129: include WebCore/SimpleRange.h where VisibleSelection is used.
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (258139 => 258140)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2020-03-09 15:10:01 UTC (rev 258140)
@@ -2061,7 +2061,7 @@
if (m_lastMouseEvent.type() != WebEvent::NoType)
coreEvent = MouseEvent::create(eventNames().clickEvent, &frame->windowProxy(), platform(m_lastMouseEvent), 0, 0);
- frame->loader().urlSelected(coreURL, emptyString(), coreEvent.get(), LockHistory::No, LockBackForwardList::No, ReferrerPolicy::NoReferrer, ShouldOpenExternalURLsPolicy::ShouldAllow);
+ frame->loader().changeLocation(coreURL, emptyString(), coreEvent.get(), LockHistory::No, LockBackForwardList::No, ReferrerPolicy::NoReferrer, ShouldOpenExternalURLsPolicy::ShouldAllow);
}
void PDFPlugin::setActiveAnnotation(PDFAnnotation *annotation)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (258139 => 258140)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -67,7 +67,7 @@
if (Page* page = frame->page()) {
UserGestureIndicator indicator(ProcessingUserGesture);
- page->mainFrame().loader().urlSelected(URL { URL { }, url }, { }, nullptr, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
+ page->mainFrame().loader().changeLocation(URL { URL { }, url }, { }, nullptr, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
}
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (258139 => 258140)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -1683,7 +1683,7 @@
auto mouseEvent = MouseEvent::create(eventNames().clickEvent, Event::CanBubble::Yes, Event::IsCancelable::Yes, Event::IsComposed::Yes,
MonotonicTime::now(), nullptr, singleClick, screenPoint, documentPoint, { }, { }, 0, 0, nullptr, 0, WebCore::NoTap);
- mainFrame->loader().urlSelected(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.ptr(), LockHistory::No, LockBackForwardList::No, ReferrerPolicy::NoReferrer, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
+ mainFrame->loader().changeLocation(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.ptr(), LockHistory::No, LockBackForwardList::No, ReferrerPolicy::NoReferrer, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
}
void WebPage::stopLoadingFrame(FrameIdentifier frameID)
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (258139 => 258140)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2020-03-09 15:10:01 UTC (rev 258140)
@@ -1,3 +1,15 @@
+2020-03-09 Rob Buis <[email protected]>
+
+ Rename urlSelected to changeLocation
+ https://bugs.webkit.org/show_bug.cgi?id=208529
+
+ Reviewed by Darin Adler.
+
+ Adapt to API change.
+
+ * WebCoreSupport/WebContextMenuClient.cpp:
+ (WebContextMenuClient::searchWithGoogle):
+
2020-03-03 Devin Rousso <[email protected]>
Web Inspector: re-add `InspectorFrontendHost` support for moving the inspected window
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebContextMenuClient.cpp (258139 => 258140)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebContextMenuClient.cpp 2020-03-09 14:52:27 UTC (rev 258139)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebContextMenuClient.cpp 2020-03-09 15:10:01 UTC (rev 258140)
@@ -66,7 +66,7 @@
if (Page* page = frame->page()) {
UserGestureIndicator indicator(ProcessingUserGesture);
- page->mainFrame().loader().urlSelected(URL { URL { }, url }, { }, nullptr, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
+ page->mainFrame().loader().changeLocation(URL { URL { }, url }, { }, nullptr, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, ShouldOpenExternalURLsPolicy::ShouldNotAllow);
}
}
