Changeset 278852 in webkit

Timestamp:

Jun 14, 2021, 4:40:09 PM (5 years ago)

Author:

Kate Cheney

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DocumentStorageAccess.cpp (modified) (1 diff)
• page/Quirks.cpp (modified) (3 diffs)
• page/Quirks.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-14  Kate Cheney  <katherine_cheney@apple.com>
+
+        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  <tsavell@apple.com>
 

trunk/Source/WebCore/dom/DocumentStorageAccess.cpp

@@ -268 +268 @@
     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 {

trunk/Source/WebCore/page/Quirks.cpp

@@ -1051 +1051 @@
     // 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.
@@ -1124 +1122 @@
 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()) {
@@ -1156 +1154 @@
     });
     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

trunk/Source/WebCore/page/Quirks.h

@@ -144 +144 @@
     WEBCORE_EXPORT static const String& staticRadioPlayerURLString();
     StorageAccessResult requestStorageAccessAndHandleClick(CompletionHandler<void(ShouldDispatchClick)>&&) const;
-    static RegistrableDomain mapToTopDomain(const URL&);
 #endif