<!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>[46487] 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/46487">46487</a></dd>
<dt>Author</dt> <dd>zimmermann@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-28 08:34:05 -0700 (Tue, 28 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-28  Nikolas Zimmermann  &lt;nikolas.zimmermann@torchmobile.com&gt;

        Reviewed by George Staikos.

        [WML] Variable substitution recursion seems to have bugs
        https://bugs.webkit.org/show_bug.cgi?id=27726

        Allow &lt;setvar&gt; elements to depend on the value specified by preceeding &lt;setvar&gt; elements.
        Required by the specification - assure it only works in linear order. A setvar element may
        not depend on the variable state of a following setvar element, only the previous ones.

        Extend wml/variable-reference-valid.html layout test to cover these cases.

        * wml/WMLTaskElement.cpp:
        (WebCore::WMLTaskElement::storeVariableState):

2009-07-28  Nikolas Zimmermann  &lt;nikolas.zimmermann@torchmobile.com&gt;

        Reviewed by George Staikos.

        [WML] Variable substitution recursion seems to have bugs
        https://bugs.webkit.org/show_bug.cgi?id=27726

        Extend variable-reference-valid.html to test &lt;setvar&gt; attribute values depending on each other.

        * wml/resources/variable-reference-valid.js:
        (setupTestDocument):
        (prepareTest):
        (executeTest):
        * wml/variable-reference-valid-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswmlresourcesvariablereferencevalidjs">trunk/LayoutTests/wml/resources/variable-reference-valid.js</a></li>
<li><a href="#trunkLayoutTestswmlvariablereferencevalidexpectedtxt">trunk/LayoutTests/wml/variable-reference-valid-expected.txt</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorewmlWMLTaskElementcpp">trunk/WebCore/wml/WMLTaskElement.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (46486 => 46487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-07-28 15:03:09 UTC (rev 46486)
+++ trunk/LayoutTests/ChangeLog        2009-07-28 15:34:05 UTC (rev 46487)
</span><span class="lines">@@ -2,6 +2,21 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by George Staikos.
</span><span class="cx"> 
</span><ins>+        [WML] Variable substitution recursion seems to have bugs
+        https://bugs.webkit.org/show_bug.cgi?id=27726
+
+        Extend variable-reference-valid.html to test &lt;setvar&gt; attribute values depending on each other.
+
+        * wml/resources/variable-reference-valid.js:
+        (setupTestDocument):
+        (prepareTest):
+        (executeTest):
+        * wml/variable-reference-valid-expected.txt:
+
+2009-07-28  Nikolas Zimmermann  &lt;nikolas.zimmermann@torchmobile.com&gt;
+
+        Reviewed by George Staikos.
+
</ins><span class="cx">         [WML] Page title doesn't update after variable substitution, if it contained variables
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=27725
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestswmlresourcesvariablereferencevalidjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/wml/resources/variable-reference-valid.js (46486 => 46487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/wml/resources/variable-reference-valid.js        2009-07-28 15:03:09 UTC (rev 46486)
+++ trunk/LayoutTests/wml/resources/variable-reference-valid.js        2009-07-28 15:34:05 UTC (rev 46487)
</span><span class="lines">@@ -17,19 +17,23 @@
</span><span class="cx">     setvarElement1.setAttribute(&quot;value&quot;, &quot;TEST PASSED&quot;);
</span><span class="cx">     refreshElement.appendChild(setvarElement1);
</span><span class="cx"> 
</span><ins>+    // 'var2' doesn't exist yet, so the value will be empty
</ins><span class="cx">     var setvarElement2 = createWMLElement(&quot;setvar&quot;);
</span><del>-    setvarElement2.setAttribute(&quot;name&quot;, &quot;var2&quot;);
-
-    // FIXME: Use $(var:escape) instead of TEST%20PASSED.
-    // This doesn't work at the moment. Investigate.
-    setvarElement2.setAttribute(&quot;value&quot;, &quot;TEST%20PASSED&quot;);
</del><ins>+    setvarElement2.setAttribute(&quot;name&quot;, &quot;wontwork&quot;);
+    setvarElement2.setAttribute(&quot;value&quot;, &quot;$var2&quot;);
</ins><span class="cx">     refreshElement.appendChild(setvarElement2);
</span><span class="cx"> 
</span><ins>+    // 'var' already exists, so the value will be &quot;TEST%20PASSED&quot;
</ins><span class="cx">     var setvarElement3 = createWMLElement(&quot;setvar&quot;);
</span><del>-    setvarElement3.setAttribute(&quot;name&quot;, &quot;v&quot;);
-    setvarElement3.setAttribute(&quot;value&quot;, &quot;TEST PASSED&quot;);
</del><ins>+    setvarElement3.setAttribute(&quot;name&quot;, &quot;var2&quot;);
+    setvarElement3.setAttribute(&quot;value&quot;, &quot;$(var:escape)&quot;);
</ins><span class="cx">     refreshElement.appendChild(setvarElement3);
</span><span class="cx"> 
</span><ins>+    var setvarElement4 = createWMLElement(&quot;setvar&quot;);
+    setvarElement4.setAttribute(&quot;name&quot;, &quot;v&quot;);
+    setvarElement4.setAttribute(&quot;value&quot;, &quot;TEST PASSED&quot;);
+    refreshElement.appendChild(setvarElement4);
+
</ins><span class="cx">     pElement1 = createWMLElement(&quot;p&quot;);
</span><span class="cx">     pElement1.textContent = &quot;Result: $var&quot;;
</span><span class="cx">     cardElement.appendChild(pElement1);
</span><span class="lines">@@ -53,6 +57,10 @@
</span><span class="cx">     pElement6 = createWMLElement(&quot;p&quot;);
</span><span class="cx">     pElement6.textContent = &quot;Result: $(v:e)&quot;;
</span><span class="cx">     cardElement.appendChild(pElement6);
</span><ins>+
+    pElement7 = createWMLElement(&quot;p&quot;);
+    pElement7.textContent = &quot;Result: $wontwork&quot;;
+    cardElement.appendChild(pElement7);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function prepareTest() {
</span><span class="lines">@@ -62,6 +70,7 @@
</span><span class="cx">     shouldBeEqualToString(&quot;pElement4.textContent&quot;, &quot;Result: $(var2:unesc)&quot;);
</span><span class="cx">     shouldBeEqualToString(&quot;pElement5.textContent&quot;, &quot;Result: $v&quot;);
</span><span class="cx">     shouldBeEqualToString(&quot;pElement6.textContent&quot;, &quot;Result: $(v:e)&quot;);
</span><ins>+    shouldBeEqualToString(&quot;pElement7.textContent&quot;, &quot;Result: $wontwork&quot;);
</ins><span class="cx"> 
</span><span class="cx">     startTest(25, 15);
</span><span class="cx"> }
</span><span class="lines">@@ -73,6 +82,7 @@
</span><span class="cx">     shouldBeEqualToString(&quot;pElement4.textContent&quot;, &quot;Result: TEST PASSED&quot;);
</span><span class="cx">     shouldBeEqualToString(&quot;pElement5.textContent&quot;, &quot;Result: TEST PASSED&quot;);
</span><span class="cx">     shouldBeEqualToString(&quot;pElement6.textContent&quot;, &quot;Result: TEST%20PASSED&quot;);
</span><ins>+    shouldBeEqualToString(&quot;pElement7.textContent&quot;, &quot;Result: &quot;);
</ins><span class="cx"> 
</span><span class="cx">     completeTest();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestswmlvariablereferencevalidexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/wml/variable-reference-valid-expected.txt (46486 => 46487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/wml/variable-reference-valid-expected.txt        2009-07-28 15:03:09 UTC (rev 46486)
+++ trunk/LayoutTests/wml/variable-reference-valid-expected.txt        2009-07-28 15:34:05 UTC (rev 46487)
</span><span class="lines">@@ -12,12 +12,14 @@
</span><span class="cx"> PASS pElement4.textContent is &quot;Result: $(var2:unesc)&quot;
</span><span class="cx"> PASS pElement5.textContent is &quot;Result: $v&quot;
</span><span class="cx"> PASS pElement6.textContent is &quot;Result: $(v:e)&quot;
</span><ins>+PASS pElement7.textContent is &quot;Result: $wontwork&quot;
</ins><span class="cx"> PASS pElement1.textContent is &quot;Result: TEST PASSED&quot;
</span><span class="cx"> PASS pElement2.textContent is &quot;Result: TEST%20PASSED&quot;
</span><span class="cx"> PASS pElement3.textContent is &quot;Result: TEST%20PASSED&quot;
</span><span class="cx"> PASS pElement4.textContent is &quot;Result: TEST PASSED&quot;
</span><span class="cx"> PASS pElement5.textContent is &quot;Result: TEST PASSED&quot;
</span><span class="cx"> PASS pElement6.textContent is &quot;Result: TEST%20PASSED&quot;
</span><ins>+PASS pElement7.textContent is &quot;Result: &quot;
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span><span class="lines">@@ -33,3 +35,4 @@
</span><span class="cx"> Result: TEST PASSED
</span><span class="cx"> Result: TEST PASSED
</span><span class="cx"> Result: TEST%20PASSED
</span><ins>+Result:
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46486 => 46487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-28 15:03:09 UTC (rev 46486)
+++ trunk/WebCore/ChangeLog        2009-07-28 15:34:05 UTC (rev 46487)
</span><span class="lines">@@ -2,6 +2,22 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by George Staikos.
</span><span class="cx"> 
</span><ins>+        [WML] Variable substitution recursion seems to have bugs
+        https://bugs.webkit.org/show_bug.cgi?id=27726
+
+        Allow &lt;setvar&gt; elements to depend on the value specified by preceeding &lt;setvar&gt; elements.
+        Required by the specification - assure it only works in linear order. A setvar element may
+        not depend on the variable state of a following setvar element, only the previous ones.
+
+        Extend wml/variable-reference-valid.html layout test to cover these cases.
+
+        * wml/WMLTaskElement.cpp:
+        (WebCore::WMLTaskElement::storeVariableState):
+
+2009-07-28  Nikolas Zimmermann  &lt;nikolas.zimmermann@torchmobile.com&gt;
+
+        Reviewed by George Staikos.
+
</ins><span class="cx">         [WML] Page title doesn't update after variable substitution, if it contained variables
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=27725
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorewmlWMLTaskElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/wml/WMLTaskElement.cpp (46486 => 46487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/wml/WMLTaskElement.cpp        2009-07-28 15:03:09 UTC (rev 46486)
+++ trunk/WebCore/wml/WMLTaskElement.cpp        2009-07-28 15:34:05 UTC (rev 46487)
</span><span class="lines">@@ -78,15 +78,19 @@
</span><span class="cx"> 
</span><span class="cx">     for (; it != end; ++it) {
</span><span class="cx">         WMLSetvarElement* setterElement = (*it);
</span><del>-        if (setterElement-&gt;name().isEmpty())
</del><ins>+
+        String name = setterElement-&gt;name();
+        if (name.isEmpty())
</ins><span class="cx">             continue;
</span><span class="cx"> 
</span><del>-        variables.set(setterElement-&gt;name(), setterElement-&gt;value());
</del><ins>+        String value = setterElement-&gt;value();
+        variables.set(name, value);
+
+        // The next setvar element may depend on this variable value. It's safe to store the current
+        // name value pair in the page state, as the whole page state is replaced soon by this new map
+        pageState-&gt;storeVariable(name, value);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (variables.isEmpty())
-        return;
-
</del><span class="cx">     pageState-&gt;storeVariables(variables);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>