<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[247621] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/247621">247621</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2019-07-18 14:56:36 -0700 (Thu, 18 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageQuirkscpp">trunk/Source/WebCore/page/Quirks.cpp</a></li>
<li><a href="#trunkSourceWebCorepageQuirksh">trunk/Source/WebCore/page/Quirks.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (247620 => 247621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-07-18 21:42:13 UTC (rev 247620)
+++ trunk/Source/WebCore/ChangeLog      2019-07-18 21:56:36 UTC (rev 247621)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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:
+
</ins><span class="cx"> 2019-07-18  Per Arne Vollan  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Crash under WebPage::boundaryEventOccurred
</span></span></pre></div>
<a id="trunkSourceWebCorepageQuirkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Quirks.cpp (247620 => 247621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Quirks.cpp     2019-07-18 21:42:13 UTC (rev 247620)
+++ trunk/Source/WebCore/page/Quirks.cpp        2019-07-18 21:56:36 UTC (rev 247621)
</span><span class="lines">@@ -230,9 +230,13 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> bool Quirks::isAmazon() const
</span><span class="cx"> {
</span><ins>+    return topPrivatelyControlledDomain(m_document->topDocument().url().host().toString()).startsWith("amazon.");
+}
+
+bool Quirks::isGoogleMaps() const
+{
</ins><span class="cx">     auto& url = m_document->topDocument().url();
</span><del>-    auto host = url.host();
-    return equalLettersIgnoringASCIICase(host, "amazon.com") || host.endsWithIgnoringASCIICase(".amazon.com");
</del><ins>+    return topPrivatelyControlledDomain(url.host().toString()).startsWith("google.") && url.path().startsWithIgnoringASCIICase("/maps/");
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool Quirks::shouldDispatchSimulatedMouseEvents() const
</span><span class="lines">@@ -249,6 +253,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (isAmazon())
</span><span class="cx">         return true;
</span><ins>+    if (isGoogleMaps())
+        return true;
</ins><span class="cx"> 
</span><span class="cx">     auto& url = m_document->topDocument().url();
</span><span class="cx">     auto host = url.host();
</span><span class="lines">@@ -267,8 +273,6 @@
</span><span class="cx">         return true;
</span><span class="cx">     if (equalLettersIgnoringASCIICase(host, "flipkart.com") || host.endsWithIgnoringASCIICase(".flipkart.com"))
</span><span class="cx">         return true;
</span><del>-    if (equalLettersIgnoringASCIICase(host, "www.google.com") && url.path().startsWithIgnoringASCIICase("/maps/"))
-        return true;
</del><span class="cx">     if (equalLettersIgnoringASCIICase(host, "trailers.apple.com"))
</span><span class="cx">         return true;
</span><span class="cx">     if (equalLettersIgnoringASCIICase(host, "naver.com"))
</span><span class="lines">@@ -303,14 +307,13 @@
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><span class="cx">     // On Google Maps, we want to limit simulated mouse events to dragging the little man that allows entering into Street View.
</span><del>-    auto& url = m_document->topDocument().url();
-    auto host = url.host();
-    if (equalLettersIgnoringASCIICase(host, "www.google.com") && url.path().startsWithIgnoringASCIICase("/maps/")) {
</del><ins>+    if (isGoogleMaps()) {
</ins><span class="cx">         if (is<Element>(target) && downcast<Element>(target)->getAttribute("class") == "widget-expand-button-pegman-icon")
</span><span class="cx">             return Event::IsCancelable::Yes;
</span><span class="cx">         return { };
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    auto host = m_document->topDocument().url().host();
</ins><span class="cx">     if (equalLettersIgnoringASCIICase(host, "desmos.com") || host.endsWithIgnoringASCIICase(".desmos.com"))
</span><span class="cx">         return Event::IsCancelable::No;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageQuirksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Quirks.h (247620 => 247621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Quirks.h       2019-07-18 21:42:13 UTC (rev 247620)
+++ trunk/Source/WebCore/page/Quirks.h  2019-07-18 21:56:36 UTC (rev 247621)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">     bool isAmazon() const;
</span><ins>+    bool isGoogleMaps() const;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     WeakPtr<Document> m_document;
</span></span></pre>
</div>
</div>

</body>
</html>