<!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>[287281] 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/287281">287281</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2021-12-20 15:01:20 -0800 (Mon, 20 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Adopt ChromeClient::classifyModalContainerControls() in ModalContainerObserver
https://bugs.webkit.org/show_bug.cgi?id=234323

Reviewed by Devin Rousso.

Hook into the new chrome client method introduced in bug #234320 in ModalContainerObserver, by propagating the
identified strings through the client layer for classification, and then using the predicted class labels to
fulfill the document loader's ModalContainerObservationPolicy.

* page/ModalContainerObserver.cpp:
(WebCore::ModalContainerObserver::updateModalContainerIfNeeded):
(WebCore::ModalContainerObserver::collectClickableElementsTimerFired):

Use the predicted class labels to find a suitable element on which we should dispatch a simulated click.

* page/ModalContainerObserver.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageModalContainerObservercpp">trunk/Source/WebCore/page/ModalContainerObserver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageModalContainerObserverh">trunk/Source/WebCore/page/ModalContainerObserver.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287280 => 287281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-20 22:55:58 UTC (rev 287280)
+++ trunk/Source/WebCore/ChangeLog      2021-12-20 23:01:20 UTC (rev 287281)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-12-20  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Adopt ChromeClient::classifyModalContainerControls() in ModalContainerObserver
+        https://bugs.webkit.org/show_bug.cgi?id=234323
+
+        Reviewed by Devin Rousso.
+
+        Hook into the new chrome client method introduced in bug #234320 in ModalContainerObserver, by propagating the
+        identified strings through the client layer for classification, and then using the predicted class labels to
+        fulfill the document loader's ModalContainerObservationPolicy.
+
+        * page/ModalContainerObserver.cpp:
+        (WebCore::ModalContainerObserver::updateModalContainerIfNeeded):
+        (WebCore::ModalContainerObserver::collectClickableElementsTimerFired):
+
+        Use the predicted class labels to find a suitable element on which we should dispatch a simulated click.
+
+        * page/ModalContainerObserver.h:
+
</ins><span class="cx"> 2021-12-20  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][IFC] Move display builder files under /display directory
</span></span></pre></div>
<a id="trunkSourceWebCorepageModalContainerObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ModalContainerObserver.cpp (287280 => 287281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ModalContainerObserver.cpp     2021-12-20 22:55:58 UTC (rev 287280)
+++ trunk/Source/WebCore/page/ModalContainerObserver.cpp        2021-12-20 23:01:20 UTC (rev 287281)
</span><span class="lines">@@ -42,10 +42,12 @@
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "HTMLInputElement.h"
</span><ins>+#include "ModalContainerControlType.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderDescendantIterator.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "RenderView.h"
</span><ins>+#include "SimulatedClickOptions.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx"> #include <wtf/Scope.h>
</span><span class="cx"> #include <wtf/URL.h>
</span><span class="lines">@@ -113,6 +115,9 @@
</span><span class="cx">     if (m_container)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    if (m_hasAttemptedToFulfillPolicy)
+        return;
+
</ins><span class="cx">     if (!view.hasViewportConstrainedObjects())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -256,7 +261,7 @@
</span><span class="cx">     if (!m_container)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    m_container->document().eventLoop().queueTask(TaskSource::InternalAsyncTask, [observer = this, weakDocument = WeakPtr { m_container->document() }] {
</del><ins>+    m_container->document().eventLoop().queueTask(TaskSource::InternalAsyncTask, [observer = this, weakDocument = WeakPtr { m_container->document() }]() mutable {
</ins><span class="cx">         RefPtr document = weakDocument.get();
</span><span class="cx">         if (!document)
</span><span class="cx">             return;
</span><span class="lines">@@ -270,7 +275,83 @@
</span><span class="cx">         if (classifiableControls.isEmpty())
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        // FIXME(234323): Classify strings by propagating them through the client layer.
</del><ins>+        auto* page = document->page();
+        if (!page) {
+            ASSERT_NOT_REACHED();
+            return;
+        }
+
+        page->chrome().client().classifyModalContainerControls(WTFMove(controlTextsToClassify), [weakDocument = WTFMove(weakDocument), observer, controls = WTFMove(classifiableControls)] (auto&& types) mutable {
+            if (types.size() != controls.size())
+                return;
+
+            RefPtr document = weakDocument.get();
+            if (!document)
+                return;
+
+            RefPtr documentLoader = document->loader();
+            if (!documentLoader) {
+                ASSERT_NOT_REACHED();
+                return;
+            }
+
+            if (observer != document->modalContainerObserverIfExists()) {
+                ASSERT_NOT_REACHED();
+                return;
+            }
+
+            Vector<Ref<HTMLElement>> positiveControls;
+            Vector<Ref<HTMLElement>> neutralControls;
+            Vector<Ref<HTMLElement>> negativeControls;
+            for (size_t index = 0; index < types.size(); ++index) {
+                auto control = controls[index];
+                if (!control)
+                    continue;
+
+                switch (types[index]) {
+                case ModalContainerControlType::Positive:
+                    positiveControls.append(*control);
+                    break;
+                case ModalContainerControlType::Negative:
+                    negativeControls.append(*control);
+                    break;
+                case ModalContainerControlType::Neutral:
+                    neutralControls.append(*control);
+                    break;
+                case ModalContainerControlType::Other:
+                    break;
+                }
+            }
+
+            RefPtr<HTMLElement> controlToClick;
+            switch (documentLoader->modalContainerObservationPolicy()) {
+            case ModalContainerObservationPolicy::Disabled:
+                ASSERT_NOT_REACHED();
+                break;
+            case ModalContainerObservationPolicy::Allow: {
+                if (!positiveControls.isEmpty())
+                    controlToClick = positiveControls[0].ptr();
+                else if (!neutralControls.isEmpty())
+                    controlToClick = neutralControls[0].ptr();
+                break;
+            }
+            case ModalContainerObservationPolicy::Disallow: {
+                if (!negativeControls.isEmpty())
+                    controlToClick = negativeControls[0].ptr();
+                else if (!neutralControls.isEmpty())
+                    controlToClick = neutralControls[0].ptr();
+                break;
+            }
+            case ModalContainerObservationPolicy::Prompt:
+                // Not supported yet.
+                break;
+            }
+
+            observer->m_hasAttemptedToFulfillPolicy = true;
+
+            if (controlToClick)
+                controlToClick->dispatchSimulatedClick(nullptr, SendMouseUpDownEvents, DoNotShowPressedLook);
+        });
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageModalContainerObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ModalContainerObserver.h (287280 => 287281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ModalContainerObserver.h       2021-12-20 22:55:58 UTC (rev 287280)
+++ trunk/Source/WebCore/page/ModalContainerObserver.h  2021-12-20 23:01:20 UTC (rev 287281)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx">     WeakPtr<Element> m_container;
</span><span class="cx">     Timer m_collectClickableElementsTimer;
</span><span class="cx">     bool m_collectingClickableElements { false };
</span><ins>+    bool m_hasAttemptedToFulfillPolicy { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>