<!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>[269962] trunk</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/269962">269962</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2020-11-18 09:45:21 -0800 (Wed, 18 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Support <source> as a child of <model> to specify the current source
https://bugs.webkit.org/show_bug.cgi?id=219080

Reviewed by Dean Jackson.

Source/WebCore:

Test: system-preview/model/model-element-source.html

* html/HTMLModelElement.cpp:
(WebCore::HTMLModelElement::sourcesChanged):
(WebCore::HTMLModelElement::setSourceURL):
(WebCore::HTMLModelElement::didMoveToNewDocument):
* html/HTMLModelElement.h:
* html/HTMLModelElement.idl:
* html/HTMLSourceElement.cpp:
(WebCore::HTMLSourceElement::insertedIntoAncestor):
(WebCore::HTMLSourceElement::removedFromAncestor):
(WebCore::HTMLSourceElement::parseAttribute):

LayoutTests:

Add a series of tests for the HTMLModelElement.currentSrc property and its relationship with <source> elements.

* system-preview/model/model-element-source-expected.txt: Added.
* system-preview/model/model-element-source.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLModelElementcpp">trunk/Source/WebCore/html/HTMLModelElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLModelElementh">trunk/Source/WebCore/html/HTMLModelElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLModelElementidl">trunk/Source/WebCore/html/HTMLModelElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSourceElementcpp">trunk/Source/WebCore/html/HTMLSourceElement.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssystempreviewmodelmodelelementsourceexpectedtxt">trunk/LayoutTests/system-preview/model/model-element-source-expected.txt</a></li>
<li><a href="#trunkLayoutTestssystempreviewmodelmodelelementsourcehtml">trunk/LayoutTests/system-preview/model/model-element-source.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (269961 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-11-18 16:58:02 UTC (rev 269961)
+++ trunk/LayoutTests/ChangeLog 2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2020-11-18  Antoine Quint  <graouts@webkit.org>
+
+        Support <source> as a child of <model> to specify the current source
+        https://bugs.webkit.org/show_bug.cgi?id=219080
+
+        Reviewed by Dean Jackson.
+
+        Add a series of tests for the HTMLModelElement.currentSrc property and its relationship with <source> elements.
+
+        * system-preview/model/model-element-source-expected.txt: Added.
+        * system-preview/model/model-element-source.html: Added.
+
</ins><span class="cx"> 2020-11-18  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r269940.
</span></span></pre></div>
<a id="trunkLayoutTestssystempreviewmodelmodelelementsourceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/system-preview/model/model-element-source-expected.txt (0 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/system-preview/model/model-element-source-expected.txt                         (rev 0)
+++ trunk/LayoutTests/system-preview/model/model-element-source-expected.txt    2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+
+PASS The HTMLModelElement interface has a currentSrc property.
+PASS The currentSrc property is read-only.
+PASS The currentSrc property is the empty string when no <source> is provided.
+PASS The currentSrc property is the empty string when a <source> is provided with no src attribute.
+PASS The currentSrc property is the empty string when a <source> is provided.
+PASS Changing the src attribute of a <source> changes the currentSrc property.
+PASS Removing the <source> changes the currentSrc property.
+PASS currentSrc returns the src value for the first <source> element.
+PASS Removing a <source> element updates currentSrc.
+PASS Adding a <source> before the current <source> updates currentSrc.
+
</ins></span></pre></div>
<a id="trunkLayoutTestssystempreviewmodelmodelelementsourcehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/system-preview/model/model-element-source.html (0 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/system-preview/model/model-element-source.html                         (rev 0)
+++ trunk/LayoutTests/system-preview/model/model-element-source.html    2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script>
+
+const makeSource = src => {
+    const source = document.createElement("source");
+    source.src = src;
+    return source;
+}
+
+test(() => {
+    assert_idl_attribute(document.createElement("model"), "currentSrc");
+}, "The HTMLModelElement interface has a currentSrc property.");
+
+test(() => {
+    assert_readonly(document.createElement("model"), "currentSrc");
+}, "The currentSrc property is read-only.");
+
+test(() => {
+    assert_equals(document.createElement("model").currentSrc, "");
+}, "The currentSrc property is the empty string when no <source> is provided.");
+
+test(() => {
+    const model = document.createElement("model");
+    model.appendChild(makeSource(""));
+    assert_equals(model.currentSrc, "");
+}, "The currentSrc property is the empty string when a <source> is provided with no src attribute.");
+
+test(() => {
+    const model = document.createElement("model");
+    const source = model.appendChild(makeSource("model.usdz"));
+    assert_equals(model.currentSrc, source.src);
+}, "The currentSrc property is the empty string when a <source> is provided.");
+
+test(() => {
+    const model = document.createElement("model");
+    const source = model.appendChild(makeSource(""));
+    assert_equals(model.currentSrc, "");
+
+    source.src = "model.usdz";
+    assert_equals(model.currentSrc, source.src);
+}, "Changing the src attribute of a <source> changes the currentSrc property.");
+
+test(() => {
+    const model = document.createElement("model");
+    const source = model.appendChild(makeSource("model.usdz"));
+    assert_equals(model.currentSrc, source.src);
+
+    source.remove();
+    assert_equals(model.currentSrc, "");
+}, "Removing the <source> changes the currentSrc property.");
+
+test(() => {
+    const model = document.createElement("model");
+    const firstSource = model.appendChild(makeSource("model-1.usdz"));
+    const secondSource = model.appendChild(makeSource("model-2.usdz"));
+    assert_equals(model.currentSrc, firstSource.src);
+}, "currentSrc returns the src value for the first <source> element.");
+
+test(() => {
+    const model = document.createElement("model");
+    const firstSource = model.appendChild(makeSource("model-1.usdz"));
+    const secondSource = model.appendChild(makeSource("model-2.usdz"));
+    assert_equals(model.currentSrc, firstSource.src);
+
+    firstSource.remove();
+    assert_equals(model.currentSrc, secondSource.src);
+}, "Removing a <source> element updates currentSrc.");
+
+test(() => {
+    const model = document.createElement("model");
+    const initialSource = model.appendChild(makeSource("model-initial.usdz"));
+    assert_equals(model.currentSrc, initialSource.src);
+
+    const secondSource = model.insertBefore(makeSource("model-initial.usdz"), initialSource);
+    assert_equals(model.currentSrc, secondSource.src);
+}, "Adding a <source> before the current <source> updates currentSrc.");
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269961 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-18 16:58:02 UTC (rev 269961)
+++ trunk/Source/WebCore/ChangeLog      2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-11-18  Antoine Quint  <graouts@webkit.org>
+
+        Support <source> as a child of <model> to specify the current source
+        https://bugs.webkit.org/show_bug.cgi?id=219080
+
+        Reviewed by Dean Jackson.
+
+        Test: system-preview/model/model-element-source.html
+
+        * html/HTMLModelElement.cpp:
+        (WebCore::HTMLModelElement::sourcesChanged):
+        (WebCore::HTMLModelElement::setSourceURL):
+        (WebCore::HTMLModelElement::didMoveToNewDocument):
+        * html/HTMLModelElement.h:
+        * html/HTMLModelElement.idl:
+        * html/HTMLSourceElement.cpp:
+        (WebCore::HTMLSourceElement::insertedIntoAncestor):
+        (WebCore::HTMLSourceElement::removedFromAncestor):
+        (WebCore::HTMLSourceElement::parseAttribute):
+
</ins><span class="cx"> 2020-11-18  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         navigator.clipboard is not exposed on *.localhost pages
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLModelElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLModelElement.cpp (269961 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLModelElement.cpp   2020-11-18 16:58:02 UTC (rev 269961)
+++ trunk/Source/WebCore/html/HTMLModelElement.cpp      2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -28,7 +28,10 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(MODEL_ELEMENT)
</span><span class="cx"> 
</span><ins>+#include "HTMLNames.h"
+#include "HTMLSourceElement.h"
</ins><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><ins>+#include <wtf/URL.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -48,6 +51,37 @@
</span><span class="cx">     return adoptRef(*new HTMLModelElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void HTMLModelElement::sourcesChanged()
+{
+    if (!document().hasBrowsingContext()) {
+        setSourceURL(URL());
+        return;
+    }
+
+    for (auto& element : childrenOfType<HTMLSourceElement>(*this)) {
+        // FIXME: for now we use the first valid URL without looking at the mime-type.
+        auto url = element.getNonEmptyURLAttribute(srcAttr);
+        if (url.isValid()) {
+            setSourceURL(url);
+            return;
+        }
+    }
+
+    setSourceURL(URL());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void HTMLModelElement::setSourceURL(const URL& url)
+{
+    // FIXME: actually do something with that URL now.
+    m_sourceURL = url;
+}
+
+void HTMLModelElement::didMoveToNewDocument(Document& oldDocument, Document& newDocument)
+{
+    HTMLElement::didMoveToNewDocument(oldDocument, newDocument);
+    sourcesChanged();
+}
+
+}
+
</ins><span class="cx"> #endif // ENABLE(MODEL_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLModelElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLModelElement.h (269961 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLModelElement.h     2020-11-18 16:58:02 UTC (rev 269961)
+++ trunk/Source/WebCore/html/HTMLModelElement.h        2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -37,8 +37,17 @@
</span><span class="cx">     static Ref<HTMLModelElement> create(const QualifiedName&, Document&);
</span><span class="cx">     virtual ~HTMLModelElement();
</span><span class="cx"> 
</span><ins>+    void sourcesChanged();
+    const URL& currentSrc() const { return m_sourceURL; }
+
</ins><span class="cx"> private:
</span><span class="cx">     HTMLModelElement(const QualifiedName&, Document&);
</span><ins>+
+    void didMoveToNewDocument(Document& oldDocument, Document& newDocument) final;
+
+    void setSourceURL(const URL&);
+
+    URL m_sourceURL;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLModelElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLModelElement.idl (269961 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLModelElement.idl   2020-11-18 16:58:02 UTC (rev 269961)
+++ trunk/Source/WebCore/html/HTMLModelElement.idl      2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -28,4 +28,5 @@
</span><span class="cx">     EnabledBySetting=ModelElement,
</span><span class="cx">     Exposed=Window,
</span><span class="cx"> ] interface HTMLModelElement : HTMLElement {
</span><ins>+    [URL] readonly attribute USVString currentSrc;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSourceElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSourceElement.cpp (269961 => 269962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSourceElement.cpp  2020-11-18 16:58:02 UTC (rev 269961)
+++ trunk/Source/WebCore/html/HTMLSourceElement.cpp     2020-11-18 17:45:21 UTC (rev 269962)
</span><span class="lines">@@ -40,6 +40,10 @@
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(MODEL_ELEMENT)
+#include "HTMLModelElement.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLSourceElement);
</span><span class="lines">@@ -77,6 +81,11 @@
</span><span class="cx">             downcast<HTMLMediaElement>(*parent).sourceWasAdded(*this);
</span><span class="cx">         else
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(MODEL_ELEMENT)
+        if (is<HTMLModelElement>(*parent))
+            downcast<HTMLModelElement>(*parent).sourcesChanged();
+        else
+#endif
</ins><span class="cx">         if (is<HTMLPictureElement>(*parent)) {
</span><span class="cx">             // The new source element only is a relevant mutation if it precedes any img element.
</span><span class="cx">             m_shouldCallSourcesChanged = true;
</span><span class="lines">@@ -100,6 +109,11 @@
</span><span class="cx">             downcast<HTMLMediaElement>(oldParentOfRemovedTree).sourceWasRemoved(*this);
</span><span class="cx">         else
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(MODEL_ELEMENT)
+        if (is<HTMLModelElement>(oldParentOfRemovedTree))
+            downcast<HTMLModelElement>(oldParentOfRemovedTree).sourcesChanged();
+        else
+#endif
</ins><span class="cx">         if (m_shouldCallSourcesChanged) {
</span><span class="cx">             downcast<HTMLPictureElement>(oldParentOfRemovedTree).sourcesChanged();
</span><span class="cx">             m_shouldCallSourcesChanged = false;
</span><span class="lines">@@ -170,6 +184,13 @@
</span><span class="cx">         if (m_shouldCallSourcesChanged)
</span><span class="cx">             downcast<HTMLPictureElement>(*parent).sourcesChanged();
</span><span class="cx">     }
</span><ins>+#if ENABLE(MODEL_ELEMENT)
+    if (name == srcAttr ||  name == typeAttr) {
+        RefPtr<Element> parent = parentElement();
+        if (is<HTMLModelElement>(parent))
+            downcast<HTMLModelElement>(*parent).sourcesChanged();
+    }
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> const MediaQuerySet* HTMLSourceElement::parsedMediaAttribute(Document& document) const
</span></span></pre>
</div>
</div>

</body>
</html>