<!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>[202559] 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/202559">202559</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-28 04:49:21 -0700 (Tue, 28 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Win] Custom elements tests are failing.
https://bugs.webkit.org/show_bug.cgi?id=159139

Reviewed by Alex Christensen.

.:

Enable custom element API on Windows. 
 
* Source/cmake/OptionsWin.cmake:

Source/WebCore:

Fix compile errors after enabling custom element API.

* bindings/js/JSHTMLElementCustom.cpp:
(WebCore::constructJSHTMLElement):
* dom/CustomElementDefinitions.cpp:
(WebCore::CustomElementDefinitions::addElementDefinition):
* dom/Document.cpp:
(WebCore::createHTMLElementWithNameValidation):
(WebCore::createFallbackHTMLElement):
* dom/Element.cpp:
(WebCore::Element::attributeChanged):
* dom/LifecycleCallbackQueue.cpp:
(WebCore::LifecycleQueueItem::LifecycleQueueItem):
(WebCore::LifecycleCallbackQueue::enqueueElementUpgrade):
(WebCore::LifecycleCallbackQueue::enqueueAttributeChangedCallback):
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::insertHTMLElementOrFindCustomElementInterface):
(WebCore::HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface):
* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::runScriptsForPausedTreeBuilder):
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::CustomElementConstructionData::CustomElementConstructionData):
(WebCore::HTMLTreeBuilder::insertGenericHTMLElement):
* html/parser/HTMLTreeBuilder.h:

Source/WebKit/win:

Add preference for enabling custom element API.

* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::customElementsEnabled):
(WebPreferences::setCustomElementsEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Tools:

Enable custom element API when running tests.

* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):

LayoutTests:

Update test expectations for passing custom elements tests.

* platform/win/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementDefinitionscpp">trunk/Source/WebCore/dom/CustomElementDefinitions.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLifecycleCallbackQueuecpp">trunk/Source/WebCore/dom/LifecycleCallbackQueue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLConstructionSitecpp">trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLDocumentParsercpp">trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuilderh">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl">trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferenceKeysPrivateh">trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencesh">trunk/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/ChangeLog        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-28  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        [Win] Custom elements tests are failing.
+        https://bugs.webkit.org/show_bug.cgi?id=159139
+
+        Reviewed by Alex Christensen.
+
+        Enable custom element API on Windows. 

+        * Source/cmake/OptionsWin.cmake:
+
</ins><span class="cx"> 2016-06-23  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.13.2 release.
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/LayoutTests/ChangeLog        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-28  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        [Win] Custom elements tests are failing.
+        https://bugs.webkit.org/show_bug.cgi?id=159139
+
+        Reviewed by Alex Christensen.
+
+        Update test expectations for passing custom elements tests.
+
+        * platform/win/TestExpectations:
+
</ins><span class="cx"> 2016-06-28  Philippe Normand  &lt;pnormand@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Web audio tests failing since GStreamer 1.6 upgrade
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/LayoutTests/platform/win/TestExpectations        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -3318,6 +3318,8 @@
</span><span class="cx"> webkit.org/b/152411 http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url.html [ Failure ]
</span><span class="cx"> webkit.org/b/152411 http/tests/contentdispositionattachmentsandbox/referer-header-stripped.html [ Failure ]
</span><span class="cx"> 
</span><ins>+webkit.org/b/150225 fast/custom-elements [ Pass ]
+
</ins><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Pass ]
</span><span class="cx"> 
</span><span class="cx"> # Touch events is not enabled on Windows
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/ChangeLog        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-06-28  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        [Win] Custom elements tests are failing.
+        https://bugs.webkit.org/show_bug.cgi?id=159139
+
+        Reviewed by Alex Christensen.
+
+        Fix compile errors after enabling custom element API.
+
+        * bindings/js/JSHTMLElementCustom.cpp:
+        (WebCore::constructJSHTMLElement):
+        * dom/CustomElementDefinitions.cpp:
+        (WebCore::CustomElementDefinitions::addElementDefinition):
+        * dom/Document.cpp:
+        (WebCore::createHTMLElementWithNameValidation):
+        (WebCore::createFallbackHTMLElement):
+        * dom/Element.cpp:
+        (WebCore::Element::attributeChanged):
+        * dom/LifecycleCallbackQueue.cpp:
+        (WebCore::LifecycleQueueItem::LifecycleQueueItem):
+        (WebCore::LifecycleCallbackQueue::enqueueElementUpgrade):
+        (WebCore::LifecycleCallbackQueue::enqueueAttributeChangedCallback):
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertHTMLElementOrFindCustomElementInterface):
+        (WebCore::HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface):
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::runScriptsForPausedTreeBuilder):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::CustomElementConstructionData::CustomElementConstructionData):
+        (WebCore::HTMLTreeBuilder::insertGenericHTMLElement):
+        * html/parser/HTMLTreeBuilder.h:
+
</ins><span class="cx"> 2016-06-28  Philippe Normand  &lt;pnormand@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GStreamer] usec rounding is wrong during accurate seeking
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx">     VM&amp; vm = state-&gt;vm();
</span><span class="cx">     JSValue newTargetValue = state-&gt;thisValue();
</span><span class="cx">     JSObject* newTarget = newTargetValue.getObject();
</span><del>-    auto* interface = definitions-&gt;findInterface(newTarget);
-    if (!interface)
</del><ins>+    auto* elementInterface = definitions-&gt;findInterface(newTarget);
+    if (!elementInterface)
</ins><span class="cx">         return throwVMTypeError(state, &quot;new.target does not define a custom element&quot;);
</span><span class="cx"> 
</span><del>-    if (!interface-&gt;isUpgradingElement()) {
</del><ins>+    if (!elementInterface-&gt;isUpgradingElement()) {
</ins><span class="cx">         auto* globalObject = jsConstructor-&gt;globalObject();
</span><span class="cx">         Structure* baseStructure = getDOMStructure&lt;JSHTMLElement&gt;(vm, *globalObject);
</span><span class="cx">         auto* newElementStructure = InternalFunction::createSubclassStructure(state, newTargetValue, baseStructure);
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">         if (UNLIKELY(state-&gt;hadException()))
</span><span class="cx">             return JSValue::encode(jsUndefined());
</span><span class="cx"> 
</span><del>-        Ref&lt;HTMLElement&gt; element = HTMLElement::create(interface-&gt;name(), document);
</del><ins>+        Ref&lt;HTMLElement&gt; element = HTMLElement::create(elementInterface-&gt;name(), document);
</ins><span class="cx">         element-&gt;setIsUnresolvedCustomElement();
</span><span class="cx">         auto* jsElement = JSHTMLElement::create(newElementStructure, globalObject, element.get());
</span><span class="cx">         cacheWrapper(globalObject-&gt;world(), element.ptr(), jsElement);
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">         return JSValue::encode(jsElement);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    Element* elementToUpgrade = interface-&gt;lastElementInConstructionStack();
</del><ins>+    Element* elementToUpgrade = elementInterface-&gt;lastElementInConstructionStack();
</ins><span class="cx">     if (!elementToUpgrade) {
</span><span class="cx">         throwInvalidStateError(*state, &quot;Cannot instantiate a custom element inside its own constrcutor during upgrades&quot;);
</span><span class="cx">         return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">     if (state-&gt;hadException())
</span><span class="cx">         return JSValue::encode(jsUndefined());
</span><span class="cx"> 
</span><del>-    interface-&gt;didUpgradeLastElementInConstructionStack();
</del><ins>+    elementInterface-&gt;didUpgradeLastElementInConstructionStack();
</ins><span class="cx"> 
</span><span class="cx">     return JSValue::encode(elementWrapperValue);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementDefinitionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementDefinitions.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementDefinitions.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/dom/CustomElementDefinitions.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-void CustomElementDefinitions::addElementDefinition(Ref&lt;JSCustomElementInterface&gt;&amp;&amp; interface)
</del><ins>+void CustomElementDefinitions::addElementDefinition(Ref&lt;JSCustomElementInterface&gt;&amp;&amp; elementInterface)
</ins><span class="cx"> {
</span><del>-    AtomicString localName = interface-&gt;name().localName();
</del><ins>+    AtomicString localName = elementInterface-&gt;name().localName();
</ins><span class="cx">     ASSERT(!m_nameMap.contains(localName));
</span><del>-    m_constructorMap.add(interface-&gt;constructor(), interface.ptr());
-    m_nameMap.add(localName, interface.copyRef());
</del><ins>+    m_constructorMap.add(elementInterface-&gt;constructor(), elementInterface.ptr());
+    m_nameMap.add(localName, elementInterface.copyRef());
</ins><span class="cx"> 
</span><span class="cx">     auto candidateList = m_upgradeCandidatesMap.find(localName);
</span><span class="cx">     if (candidateList == m_upgradeCandidatesMap.end())
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> 
</span><span class="cx">     for (auto&amp; candidate : list) {
</span><span class="cx">         ASSERT(candidate);
</span><del>-        interface-&gt;upgradeElement(*candidate);
</del><ins>+        elementInterface-&gt;upgradeElement(*candidate);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // We should not be adding more upgrade candidate for this local name.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/dom/Document.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -883,8 +883,8 @@
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx">     auto* definitions = document.customElementDefinitions();
</span><span class="cx">     if (UNLIKELY(definitions)) {
</span><del>-        if (auto* interface = definitions-&gt;findInterface(localName))
-            return interface-&gt;constructElement(localName, JSCustomElementInterface::ShouldClearException::DoNotClear);
</del><ins>+        if (auto* elementInterface = definitions-&gt;findInterface(localName))
+            return elementInterface-&gt;constructElement(localName, JSCustomElementInterface::ShouldClearException::DoNotClear);
</ins><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -1074,10 +1074,10 @@
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx">     auto* definitions = document.customElementDefinitions();
</span><span class="cx">     if (UNLIKELY(definitions)) {
</span><del>-        if (auto* interface = definitions-&gt;findInterface(name)) {
</del><ins>+        if (auto* elementInterface = definitions-&gt;findInterface(name)) {
</ins><span class="cx">             Ref&lt;HTMLElement&gt; element = HTMLElement::create(name, document);
</span><span class="cx">             element-&gt;setIsUnresolvedCustomElement();
</span><del>-            LifecycleCallbackQueue::enqueueElementUpgrade(element.get(), *interface);
</del><ins>+            LifecycleCallbackQueue::enqueueElementUpgrade(element.get(), *elementInterface);
</ins><span class="cx">             return element;
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/dom/Element.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -1280,9 +1280,9 @@
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx">     if (UNLIKELY(isCustomElement())) {
</span><span class="cx">         auto* definitions = document().customElementDefinitions();
</span><del>-        auto* interface = definitions-&gt;findInterface(tagQName());
-        RELEASE_ASSERT(interface);
-        LifecycleCallbackQueue::enqueueAttributeChangedCallback(*this, *interface, name, oldValue, newValue);
</del><ins>+        auto* elementInterface = definitions-&gt;findInterface(tagQName());
+        RELEASE_ASSERT(elementInterface);
+        LifecycleCallbackQueue::enqueueAttributeChangedCallback(*this, *elementInterface, name, oldValue, newValue);
</ins><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomLifecycleCallbackQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LifecycleCallbackQueue.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LifecycleCallbackQueue.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/dom/LifecycleCallbackQueue.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -45,16 +45,16 @@
</span><span class="cx">         AttributeChanged,
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    LifecycleQueueItem(Type type, Element&amp; element, JSCustomElementInterface&amp; interface)
</del><ins>+    LifecycleQueueItem(Type type, Element&amp; element, JSCustomElementInterface&amp; elementInterface)
</ins><span class="cx">         : m_type(type)
</span><span class="cx">         , m_element(element)
</span><del>-        , m_interface(interface)
</del><ins>+        , m_interface(elementInterface)
</ins><span class="cx">     { }
</span><span class="cx"> 
</span><del>-    LifecycleQueueItem(Element&amp; element, JSCustomElementInterface&amp; interface, const QualifiedName&amp; attributeName, const AtomicString&amp; oldValue, const AtomicString&amp; newValue)
</del><ins>+    LifecycleQueueItem(Element&amp; element, JSCustomElementInterface&amp; elementInterface, const QualifiedName&amp; attributeName, const AtomicString&amp; oldValue, const AtomicString&amp; newValue)
</ins><span class="cx">         : m_type(Type::AttributeChanged)
</span><span class="cx">         , m_element(element)
</span><del>-        , m_interface(interface)
</del><ins>+        , m_interface(elementInterface)
</ins><span class="cx">         , m_attributeName(attributeName)
</span><span class="cx">         , m_oldValue(oldValue)
</span><span class="cx">         , m_newValue(newValue)
</span><span class="lines">@@ -90,17 +90,17 @@
</span><span class="cx">     ASSERT(m_items.isEmpty());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LifecycleCallbackQueue::enqueueElementUpgrade(Element&amp; element, JSCustomElementInterface&amp; interface)
</del><ins>+void LifecycleCallbackQueue::enqueueElementUpgrade(Element&amp; element, JSCustomElementInterface&amp; elementInterface)
</ins><span class="cx"> {
</span><span class="cx">     if (auto* queue = CustomElementLifecycleProcessingStack::ensureCurrentQueue())
</span><del>-        queue-&gt;m_items.append(LifecycleQueueItem(LifecycleQueueItem::Type::ElementUpgrade, element, interface));
</del><ins>+        queue-&gt;m_items.append(LifecycleQueueItem(LifecycleQueueItem::Type::ElementUpgrade, element, elementInterface));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LifecycleCallbackQueue::enqueueAttributeChangedCallback(Element&amp; element, JSCustomElementInterface&amp; interface,
</del><ins>+void LifecycleCallbackQueue::enqueueAttributeChangedCallback(Element&amp; element, JSCustomElementInterface&amp; elementInterface,
</ins><span class="cx">     const QualifiedName&amp; attributeName, const AtomicString&amp; oldValue, const AtomicString&amp; newValue)
</span><span class="cx"> {
</span><span class="cx">     if (auto* queue = CustomElementLifecycleProcessingStack::ensureCurrentQueue())
</span><del>-        queue-&gt;m_items.append(LifecycleQueueItem(element, interface, attributeName, oldValue, newValue));
</del><ins>+        queue-&gt;m_items.append(LifecycleQueueItem(element, elementInterface, attributeName, oldValue, newValue));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void LifecycleCallbackQueue::invokeAll()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLConstructionSitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -482,10 +482,10 @@
</span><span class="cx"> 
</span><span class="cx"> JSCustomElementInterface* HTMLConstructionSite::insertHTMLElementOrFindCustomElementInterface(AtomicHTMLToken&amp; token)
</span><span class="cx"> {
</span><del>-    JSCustomElementInterface* interface = nullptr;
-    RefPtr&lt;Element&gt; element = createHTMLElementOrFindCustomElementInterface(token, &amp;interface);
-    if (UNLIKELY(interface))
-        return interface;
</del><ins>+    JSCustomElementInterface* elementInterface = nullptr;
+    RefPtr&lt;Element&gt; element = createHTMLElementOrFindCustomElementInterface(token, &amp;elementInterface);
+    if (UNLIKELY(elementInterface))
+        return elementInterface;
</ins><span class="cx">     attachLater(currentNode(), *element);
</span><span class="cx">     m_openElements.push(HTMLStackItem::create(element.releaseNonNull(), token));
</span><span class="cx">     return nullptr;
</span><span class="lines">@@ -661,8 +661,8 @@
</span><span class="cx">         if (customElementInterface) {
</span><span class="cx">             auto* definitions = ownerDocument.customElementDefinitions();
</span><span class="cx">             if (UNLIKELY(definitions)) {
</span><del>-                if (auto* interface = definitions-&gt;findInterface(localName)) {
-                    *customElementInterface = interface;
</del><ins>+                if (auto* elementInterface = definitions-&gt;findInterface(localName)) {
+                    *customElementInterface = elementInterface;
</ins><span class="cx">                     return nullptr;
</span><span class="cx">                 }
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">     if (std::unique_ptr&lt;CustomElementConstructionData&gt; constructionData = m_treeBuilder-&gt;takeCustomElementConstructionData()) {
</span><span class="cx">         ASSERT(!m_treeBuilder-&gt;hasParserBlockingScriptWork());
</span><span class="cx"> 
</span><del>-        RefPtr&lt;Element&gt; newElement = constructionData-&gt;interface-&gt;constructElement(constructionData-&gt;name, JSCustomElementInterface::ShouldClearException::Clear);
</del><ins>+        RefPtr&lt;Element&gt; newElement = constructionData-&gt;elementInterface-&gt;constructElement(constructionData-&gt;name, JSCustomElementInterface::ShouldClearException::Clear);
</ins><span class="cx">         if (!newElement) {
</span><span class="cx">             ASSERT(!m_treeBuilder-&gt;isParsingTemplateContents());
</span><span class="cx">             newElement = HTMLUnknownElement::create(QualifiedName(nullAtom, constructionData-&gt;name, xhtmlNamespaceURI), *document());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx"> 
</span><del>-CustomElementConstructionData::CustomElementConstructionData(Ref&lt;JSCustomElementInterface&gt;&amp;&amp; interface, const AtomicString&amp; name, const Vector&lt;Attribute&gt;&amp; attributes)
-    : interface(WTFMove(interface))
</del><ins>+CustomElementConstructionData::CustomElementConstructionData(Ref&lt;JSCustomElementInterface&gt;&amp;&amp; customElementInterface, const AtomicString&amp; name, const Vector&lt;Attribute&gt;&amp; attributes)
+    : elementInterface(WTFMove(customElementInterface))
</ins><span class="cx">     , name(name)
</span><span class="cx">     , attributes(attributes) // FIXME: Avoid copying attributes.
</span><span class="cx"> { }
</span><span class="lines">@@ -909,9 +909,9 @@
</span><span class="cx"> inline void HTMLTreeBuilder::insertGenericHTMLElement(AtomicHTMLToken&amp; token)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><del>-    auto* interface = m_tree.insertHTMLElementOrFindCustomElementInterface(token);
-    if (UNLIKELY(interface))
-        m_customElementToConstruct = std::make_unique&lt;CustomElementConstructionData&gt;(*interface, token.name(), token.attributes());
</del><ins>+    auto* elementInterface = m_tree.insertHTMLElementOrFindCustomElementInterface(token);
+    if (UNLIKELY(elementInterface))
+        m_customElementToConstruct = std::make_unique&lt;CustomElementConstructionData&gt;(*elementInterface, token.name(), token.attributes());
</ins><span class="cx"> #else
</span><span class="cx">     m_tree.insertHTMLElement(token);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">     CustomElementConstructionData(Ref&lt;JSCustomElementInterface&gt;&amp;&amp;, const AtomicString&amp; name, const Vector&lt;Attribute&gt;&amp;);
</span><span class="cx">     ~CustomElementConstructionData();
</span><span class="cx"> 
</span><del>-    Ref&lt;JSCustomElementInterface&gt; interface;
</del><ins>+    Ref&lt;JSCustomElementInterface&gt; elementInterface;
</ins><span class="cx">     AtomicString name;
</span><span class="cx">     Vector&lt;Attribute&gt; attributes;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebKit/win/ChangeLog        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-28  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        [Win] Custom elements tests are failing.
+        https://bugs.webkit.org/show_bug.cgi?id=159139
+
+        Reviewed by Alex Christensen.
+
+        Add preference for enabling custom element API.
+
+        * Interfaces/IWebPreferencesPrivate.idl:
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::customElementsEnabled):
+        (WebPreferences::setCustomElementsEnabled):
+        * WebPreferences.h:
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2016-06-23  Per Arne Vollan  &lt;pvollan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] The test accessibility/aria-labelledby-overrides-label.html is failing.
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -179,5 +179,7 @@
</span><span class="cx">     HRESULT setFetchAPIEnabled([in] BOOL enabled);
</span><span class="cx">     HRESULT shadowDOMEnabled([out, retval] BOOL* enabled);
</span><span class="cx">     HRESULT setShadowDOMEnabled([in] BOOL enabled);
</span><ins>+    HRESULT customElementsEnabled([out, retval] BOOL* enabled);
+    HRESULT setCustomElementsEnabled([in] BOOL enabled);
</ins><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -171,3 +171,5 @@
</span><span class="cx"> #define WebKitFetchAPIEnabledPreferenceKey &quot;WebKitFetchAPIEnabled&quot;
</span><span class="cx"> 
</span><span class="cx"> #define WebKitShadowDOMEnabledPreferenceKey &quot;WebKitShadowDOMEnabled&quot;
</span><ins>+
+#define WebKitCustomElementsEnabledPreferenceKey &quot;WebKitCustomElementsEnabled&quot;
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebKit/win/WebPreferences.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -295,6 +295,8 @@
</span><span class="cx"> 
</span><span class="cx">     CFDictionaryAddValue(defaults, CFSTR(WebKitShadowDOMEnabledPreferenceKey), kCFBooleanFalse);
</span><span class="cx"> 
</span><ins>+    CFDictionaryAddValue(defaults, CFSTR(WebKitCustomElementsEnabledPreferenceKey), kCFBooleanFalse);
+
</ins><span class="cx">     defaultSettings = defaults;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1949,3 +1951,17 @@
</span><span class="cx">     setBoolValue(WebKitShadowDOMEnabledPreferenceKey, enabled);
</span><span class="cx">     return S_OK;
</span><span class="cx"> }
</span><ins>+
+HRESULT WebPreferences::customElementsEnabled(_Out_ BOOL* enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+    *enabled = boolValueForKey(WebKitCustomElementsEnabledPreferenceKey);
+    return S_OK;
+}
+
+HRESULT WebPreferences::setCustomElementsEnabled(BOOL enabled)
+{
+    setBoolValue(WebKitCustomElementsEnabledPreferenceKey, enabled);
+    return S_OK;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.h (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.h        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebKit/win/WebPreferences.h        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -237,6 +237,8 @@
</span><span class="cx">     virtual HRESULT STDMETHODCALLTYPE setFetchAPIEnabled(BOOL);
</span><span class="cx">     virtual HRESULT STDMETHODCALLTYPE shadowDOMEnabled(_Out_ BOOL*);
</span><span class="cx">     virtual HRESULT STDMETHODCALLTYPE setShadowDOMEnabled(BOOL);
</span><ins>+    virtual HRESULT STDMETHODCALLTYPE customElementsEnabled(_Out_ BOOL*);
+    virtual HRESULT STDMETHODCALLTYPE setCustomElementsEnabled(BOOL);
</ins><span class="cx"> 
</span><span class="cx">     // WebPreferences
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/WebKit/win/WebView.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -5052,6 +5052,13 @@
</span><span class="cx">         return hr;
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(!!enabled);
</span><span class="cx"> 
</span><ins>+#if ENABLE(CUSTOM_ELEMENTS)
+    hr = prefsPrivate-&gt;customElementsEnabled(&amp;enabled);
+    if (FAILED(hr))
+        return hr;
+    RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(!!enabled);
+#endif
+
</ins><span class="cx">     hr = preferences-&gt;privateBrowsingEnabled(&amp;enabled);
</span><span class="cx">     if (FAILED(hr))
</span><span class="cx">         return hr;
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Source/cmake/OptionsWin.cmake        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_ELEMENTS PRIVATE OFF)
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_ELEMENTS PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_TRANSFER_ITEMS PUBLIC OFF)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Tools/ChangeLog        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-28  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        [Win] Custom elements tests are failing.
+        https://bugs.webkit.org/show_bug.cgi?id=159139
+
+        Reviewed by Alex Christensen.
+
+        Enable custom element API when running tests.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetWebPreferencesToConsistentValues):
+
</ins><span class="cx"> 2016-06-27  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Test commit. Please ignore.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (202558 => 202559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp        2016-06-28 11:26:07 UTC (rev 202558)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp        2016-06-28 11:49:21 UTC (rev 202559)
</span><span class="lines">@@ -851,6 +851,7 @@
</span><span class="cx">     ASSERT(prefsPrivate3);
</span><span class="cx">     prefsPrivate3-&gt;setFetchAPIEnabled(TRUE);
</span><span class="cx">     prefsPrivate3-&gt;setShadowDOMEnabled(TRUE);
</span><ins>+    prefsPrivate3-&gt;setCustomElementsEnabled(TRUE);
</ins><span class="cx"> 
</span><span class="cx">     setAlwaysAcceptCookies(false);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>