Title: [278852] trunk/Source/WebCore
Revision
278852
Author
[email protected]
Date
2021-06-14 16:40:09 -0700 (Mon, 14 Jun 2021)

Log Message

Remove Storage Access API quirk on live.com
https://bugs.webkit.org/show_bug.cgi?id=226990
<rdar://problem/79218986>

Reviewed by Brent Fulgham.

The quirk on live.com is unnecessary, and we should remove it.

* dom/DocumentStorageAccess.cpp:
(WebCore::DocumentStorageAccess::requestStorageAccessQuirk):
* page/Quirks.cpp:
(WebCore::isStorageAccessQuirkDomainAndElement):
(WebCore::Quirks::requestStorageAccessAndHandleClick const):
(WebCore::Quirks::mapToTopDomain): Deleted.
* page/Quirks.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (278851 => 278852)


--- trunk/Source/WebCore/ChangeLog	2021-06-14 23:39:32 UTC (rev 278851)
+++ trunk/Source/WebCore/ChangeLog	2021-06-14 23:40:09 UTC (rev 278852)
@@ -1,3 +1,21 @@
+2021-06-14  Kate Cheney  <[email protected]>
+
+        Remove Storage Access API quirk on live.com
+        https://bugs.webkit.org/show_bug.cgi?id=226990
+        <rdar://problem/79218986>
+
+        Reviewed by Brent Fulgham.
+
+        The quirk on live.com is unnecessary, and we should remove it.
+
+        * dom/DocumentStorageAccess.cpp:
+        (WebCore::DocumentStorageAccess::requestStorageAccessQuirk):
+        * page/Quirks.cpp:
+        (WebCore::isStorageAccessQuirkDomainAndElement):
+        (WebCore::Quirks::requestStorageAccessAndHandleClick const):
+        (WebCore::Quirks::mapToTopDomain): Deleted.
+        * page/Quirks.h:
+
 2021-06-14  Truitt Savell  <[email protected]>
 
         Unreviewed, reverting r278842.

Modified: trunk/Source/WebCore/dom/DocumentStorageAccess.cpp (278851 => 278852)


--- trunk/Source/WebCore/dom/DocumentStorageAccess.cpp	2021-06-14 23:39:32 UTC (rev 278851)
+++ trunk/Source/WebCore/dom/DocumentStorageAccess.cpp	2021-06-14 23:40:09 UTC (rev 278852)
@@ -267,7 +267,7 @@
     ASSERT(m_document.settings().storageAccessAPIEnabled());
     RELEASE_ASSERT(m_document.frame() && m_document.frame()->page());
 
-    auto topFrameDomain = Quirks::mapToTopDomain(m_document.topDocument().url());
+    auto topFrameDomain = RegistrableDomain(m_document.topDocument().url());
 
     m_document.frame()->page()->chrome().client().requestStorageAccess(WTFMove(requestingDomain), WTFMove(topFrameDomain), *m_document.frame(), m_storageAccessScope, [this, weakThis = makeWeakPtr(*this), completionHandler = WTFMove(completionHandler)] (RequestStorageAccessResult result) mutable {
         if (!weakThis)

Modified: trunk/Source/WebCore/page/Quirks.cpp (278851 => 278852)


--- trunk/Source/WebCore/page/Quirks.cpp	2021-06-14 23:39:32 UTC (rev 278851)
+++ trunk/Source/WebCore/page/Quirks.cpp	2021-06-14 23:40:09 UTC (rev 278852)
@@ -1050,13 +1050,11 @@
 {
     // Microsoft Teams login case.
     // FIXME(218779): Remove this quirk once microsoft.com completes their login flow redesign.
-    if (url.host() == "www.microsoft.com"_s || url.host() == "login.live.com"_s) {
+    if (url.host() == "www.microsoft.com"_s) {
         return element.hasClass()
         && (element.classNames().contains("glyph_signIn_circle")
         || element.classNames().contains("mectrl_headertext")
-        || element.classNames().contains("mectrl_header")
-        || element.classNames().contains("ext-button primary")
-        || element.classNames().contains("ext-primary"));
+        || element.classNames().contains("mectrl_header"));
     }
     // Skype case.
     // FIXME(220105): Remove this quirk once Skype under outlook.live.com completes their login flow redesign.
@@ -1123,7 +1121,7 @@
 
 Quirks::StorageAccessResult Quirks::requestStorageAccessAndHandleClick(CompletionHandler<void(ShouldDispatchClick)>&& completionHandler) const
 {
-    auto firstPartyDomain = mapToTopDomain(m_document->topDocument().url());
+    auto firstPartyDomain = RegistrableDomain(m_document->topDocument().url());
     auto domainsInNeedOfStorageAccess = NetworkStorageSession::subResourceDomainsInNeedOfStorageAccessForFirstParty(firstPartyDomain);
     if (!domainsInNeedOfStorageAccess || domainsInNeedOfStorageAccess.value().isEmpty()) {
         completionHandler(ShouldDispatchClick::No);
@@ -1156,14 +1154,6 @@
     });
     return Quirks::StorageAccessResult::ShouldCancelEvent;
 }
-
-RegistrableDomain Quirks::mapToTopDomain(const URL& urlToMap)
-{
-    if (urlToMap.host() == "login.live.com"_s)
-        return RegistrableDomain::uncheckedCreateFromRegistrableDomainString("microsoft.com"_s);
-
-    return RegistrableDomain(urlToMap);
-}
 #endif
 
 Quirks::StorageAccessResult Quirks::triggerOptionalStorageAccessQuirk(Element& element, const PlatformMouseEvent& platformEvent, const AtomString& eventType, int detail, Element* relatedTarget, bool isParentProcessAFullWebBrowser) const

Modified: trunk/Source/WebCore/page/Quirks.h (278851 => 278852)


--- trunk/Source/WebCore/page/Quirks.h	2021-06-14 23:39:32 UTC (rev 278851)
+++ trunk/Source/WebCore/page/Quirks.h	2021-06-14 23:40:09 UTC (rev 278852)
@@ -143,7 +143,6 @@
     static const String& BBCRadioPlayerURLString();
     WEBCORE_EXPORT static const String& staticRadioPlayerURLString();
     StorageAccessResult requestStorageAccessAndHandleClick(CompletionHandler<void(ShouldDispatchClick)>&&) const;
-    static RegistrableDomain mapToTopDomain(const URL&);
 #endif
 
 #if ENABLE(WEB_AUTHN)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to