Changeset 247621 in webkit

Timestamp:

Jul 18, 2019 2:56:36 PM (5 years ago)

Author:

graouts@webkit.org

Message:

Ensure Quirks::shouldDispatchSimulatedMouseEvents() works for all Google Maps and Amazon domains
​https://bugs.webkit.org/show_bug.cgi?id=199904
<rdar://problem/53250104>

Reviewed by Dean Jackson.

Use topPrivatelyControlledDomain() to determine whether the URL is a Google or Amazon domain so as to apply
Google Maps and Amazon quirks to all the various domain names used.

• page/Quirks.cpp:

(WebCore::Quirks::isAmazon const):
(WebCore::Quirks::isGoogleMaps const):
(WebCore::Quirks::shouldDispatchSimulatedMouseEvents const):
(WebCore::Quirks::simulatedMouseEventTypeForTarget const):

• page/Quirks.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Quirks.cpp (modified) (4 diffs)
• page/Quirks.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-18  Antoine Quint  <graouts@apple.com>
+
+        Ensure Quirks::shouldDispatchSimulatedMouseEvents() works for all Google Maps and Amazon domains
+        https://bugs.webkit.org/show_bug.cgi?id=199904
+        <rdar://problem/53250104>
+
+        Reviewed by Dean Jackson.
+
+        Use topPrivatelyControlledDomain() to determine whether the URL is a Google or Amazon domain so as to apply
+        Google Maps and Amazon quirks to all the various domain names used.
+
+        * page/Quirks.cpp:
+        (WebCore::Quirks::isAmazon const):
+        (WebCore::Quirks::isGoogleMaps const):
+        (WebCore::Quirks::shouldDispatchSimulatedMouseEvents const):
+        (WebCore::Quirks::simulatedMouseEventTypeForTarget const):
+        * page/Quirks.h:
+
 2019-07-18  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/page/Quirks.cpp

@@ -231 +231 @@
 bool Quirks::isAmazon() const
 {
+    return topPrivatelyControlledDomain(m_document->topDocument().url().host().toString()).startsWith("amazon.");
+}
+
+bool Quirks::isGoogleMaps() const
+{
+    auto& url = m_document->topDocument().url();
+    return topPrivatelyControlledDomain(url.host().toString()).startsWith("google.") && url.path().startsWithIgnoringASCIICase("/maps/");
+}
+
+bool Quirks::shouldDispatchSimulatedMouseEvents() const
+{
+    if (RuntimeEnabledFeatures::sharedFeatures().mouseEventsSimulationEnabled())
+        return true;
+
+    if (!needsQuirks())
+        return false;
+
+    auto* loader = m_document->loader();
+    if (!loader || loader->simulatedMouseEventsDispatchPolicy() != SimulatedMouseEventsDispatchPolicy::Allow)
+        return false;
+
+    if (isAmazon())
+        return true;
+    if (isGoogleMaps())
+        return true;
+
     auto& url = m_document->topDocument().url();
     auto host = url.host();
-    return equalLettersIgnoringASCIICase(host, "amazon.com") || host.endsWithIgnoringASCIICase(".amazon.com");
-}
-
-bool Quirks::shouldDispatchSimulatedMouseEvents() const
-{
-    if (RuntimeEnabledFeatures::sharedFeatures().mouseEventsSimulationEnabled())
-        return true;
-
-    if (!needsQuirks())
-        return false;
-
-    auto* loader = m_document->loader();
-    if (!loader || loader->simulatedMouseEventsDispatchPolicy() != SimulatedMouseEventsDispatchPolicy::Allow)
-        return false;
-
-    if (isAmazon())
-        return true;
-
-    auto& url = m_document->topDocument().url();
-    auto host = url.host();
 
     if (equalLettersIgnoringASCIICase(host, "wix.com") || host.endsWithIgnoringASCIICase(".wix.com"))
@@ -267 +273 @@
         return true;
     if (equalLettersIgnoringASCIICase(host, "flipkart.com") || host.endsWithIgnoringASCIICase(".flipkart.com"))
-        return true;
-    if (equalLettersIgnoringASCIICase(host, "www.google.com") && url.path().startsWithIgnoringASCIICase("/maps/"))
         return true;
     if (equalLettersIgnoringASCIICase(host, "trailers.apple.com"))
@@ -304 +308 @@
 
     // On Google Maps, we want to limit simulated mouse events to dragging the little man that allows entering into Street View.
-    auto& url = m_document->topDocument().url();
-    auto host = url.host();
-    if (equalLettersIgnoringASCIICase(host, "www.google.com") && url.path().startsWithIgnoringASCIICase("/maps/")) {
+    if (isGoogleMaps()) {
         if (is<Element>(target) && downcast<Element>(target)->getAttribute("class") == "widget-expand-button-pegman-icon")
             return Event::IsCancelable::Yes;
@@ -312 +314 @@
     }
 
+    auto host = m_document->topDocument().url().host();
     if (equalLettersIgnoringASCIICase(host, "desmos.com") || host.endsWithIgnoringASCIICase(".desmos.com"))
         return Event::IsCancelable::No;

trunk/Source/WebCore/page/Quirks.h

@@ -74 +74 @@
 #if ENABLE(TOUCH_EVENTS)
     bool isAmazon() const;
+    bool isGoogleMaps() const;
 #endif