<!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>[166134] 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/166134">166134</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-22 19:43:52 -0700 (Sat, 22 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace deprecatedIsCollapsibleWhitespace with RenderStyle::isCollapsibleWhiteSpace in TextIterator.
https://bugs.webkit.org/show_bug.cgi?id=130612.
Patch by Chang Shu <cshu@webkit.org> on 2014-03-22
Reviewed by Darin Adler.
Source/WebCore:
Some layout tests are affected by this change but the new behavior should be correct.
* editing/TextIterator.cpp:
(WebCore::TextIterator::handleTextNode):
(WebCore::TextIterator::handleTextBox):
LayoutTests:
* accessibility/table-scope-expected.txt:
* editing/deleting/delete-block-table-expected.txt:
* editing/pasteboard/paste-into-anchor-text-expected.txt:
* fast/dom/Element/offsetTop-table-cell-expected.txt:
* fast/html/object-border-expected.txt:
* fast/table/cell-in-row-before-misnested-text-crash-css-expected.txt:
* fast/table/cell-in-row-before-misnested-text-crash-expected.txt:
* fast/tokenizer/script_extra_close-expected.txt:
* fast/xsl/mozilla-tests-expected.txt:
* platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt:
* platform/mac/accessibility/table-multi-bodies-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytablescopeexpectedtxt">trunk/LayoutTests/accessibility/table-scope-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingdeletingdeleteblocktableexpectedtxt">trunk/LayoutTests/editing/deleting/delete-block-table-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpasteintoanchortextexpectedtxt">trunk/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomElementoffsetToptablecellexpectedtxt">trunk/LayoutTests/fast/dom/Element/offsetTop-table-cell-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthtmlobjectborderexpectedtxt">trunk/LayoutTests/fast/html/object-border-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttablecellinrowbeforemisnestedtextcrashcssexpectedtxt">trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-css-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttablecellinrowbeforemisnestedtextcrashexpectedtxt">trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttokenizerscript_extra_closeexpectedtxt">trunk/LayoutTests/fast/tokenizer/script_extra_close-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastxslmozillatestsexpectedtxt">trunk/LayoutTests/fast/xsl/mozilla-tests-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityariagridwithstrangehierarchyexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablemultibodiesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-multi-bodies-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/ChangeLog 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-22 Chang Shu <cshu@webkit.org>
+
+ Replace deprecatedIsCollapsibleWhitespace with RenderStyle::isCollapsibleWhiteSpace in TextIterator.
+ https://bugs.webkit.org/show_bug.cgi?id=130612.
+
+ Reviewed by Darin Adler.
+
+ * accessibility/table-scope-expected.txt:
+ * editing/deleting/delete-block-table-expected.txt:
+ * editing/pasteboard/paste-into-anchor-text-expected.txt:
+ * fast/dom/Element/offsetTop-table-cell-expected.txt:
+ * fast/html/object-border-expected.txt:
+ * fast/table/cell-in-row-before-misnested-text-crash-css-expected.txt:
+ * fast/table/cell-in-row-before-misnested-text-crash-expected.txt:
+ * fast/tokenizer/script_extra_close-expected.txt:
+ * fast/xsl/mozilla-tests-expected.txt:
+ * platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt:
+ * platform/mac/accessibility/table-multi-bodies-expected.txt:
+
</ins><span class="cx"> 2014-03-22 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> toThis() on a JSWorkerGlobalScope should return a JSProxy and not undefined
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytablescopeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/table-scope-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-scope-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/accessibility/table-scope-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> Community Courses -- Bath Autumn 1997
</span><span class="cx"> Course Name Course Tutor Summary Code Fee
</span><del>-After the Civil War Dr. John Wroughton The course will examine the turbulent years in England after 1646. 6 weekly meetings starting Monday 13th October. H27 £32 £32
-An Introduction to Anglo-Saxon England Mark Cottle One day course introducing the early medieval period reconstruction the Anglo-Saxons and their society. Saturday 18th October. H28 £18 £18
-The Glory that was Greece Birthplace of democracy, philosophy, heartland of theater, home of argument. The Romans may have done it but the Greeks did it first. Saturday day school 25th October 1997 H30 £18 £18
</del><ins>+After the Civil War Dr. John Wroughton The course will examine the turbulent years in England after 1646. 6 weekly meetings starting Monday 13th October. H27 £32 £32
+An Introduction to Anglo-Saxon England Mark Cottle One day course introducing the early medieval period reconstruction the Anglo-Saxons and their society. Saturday 18th October. H28 £18 £18
+The Glory that was Greece Birthplace of democracy, philosophy, heartland of theater, home of argument. The Romans may have done it but the Greeks did it first. Saturday day school 25th October 1997 H30 £18 £18
</ins><span class="cx"> This tests the scope attribute on table cells will manifest as the right header elements on the cells in that row or column.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeleteblocktableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/delete-block-table-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-block-table-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/editing/deleting/delete-block-table-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> This test checks that deleting into a table works properly. When deleting three times with the cursor after the character "a" in the "after" text after the table, the "a" should be deleted, as should the "o" of "buffalo" in the last table cell.
</span><span class="cx">
</span><span class="cx"> Before
</span><del>-Foo baz
-bar buffalfter
</del><ins>+Foo baz
+bar buffalfter
</ins><span class="cx"> execDeleteCommand: <div>Before</div> <table style="border:3px solid #aaa;"> <tbody><tr> <td> Foo </td> <td> baz </td> </tr> <tr> <td> bar </td> <td> buffalo </td> </tr> </tbody></table> <span id="start">fter</span>
</span><span class="cx"> execDeleteCommand: <div>Before</div> <table style="border:3px solid #aaa;"> <tbody><tr> <td> Foo </td> <td> baz </td> </tr> <tr> <td> bar </td> <td> buffalofter</td></tr></tbody></table>
</span><span class="cx"> execDeleteCommand: <div>Before</div> <table style="border:3px solid #aaa;"> <tbody><tr> <td> Foo </td> <td> baz </td> </tr> <tr> <td> bar </td> <td> buffalfter</td></tr></tbody></table>
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpasteintoanchortextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -5,5 +5,5 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx">
</span><del>-Canton Repository (subscription) all 7hello world9 news articles
</del><ins>+Canton Repository (subscription) all 7hello world9 news articles
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomElementoffsetToptablecellexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Element/offsetTop-table-cell-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Element/offsetTop-table-cell-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/fast/dom/Element/offsetTop-table-cell-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -11,5 +11,5 @@
</span><span class="cx"> Test result: PASS
</span><span class="cx"> x
</span><span class="cx"> This
</span><del>-is more text. And a lot more text that should have the smallest offsetTop.
</del><ins>+is more text. And a lot more text that should have the smallest offsetTop.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasthtmlobjectborderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/html/object-border-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/object-border-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/fast/html/object-border-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Title Actual Image Expected Image
</del><ins>+Title Actual Image Expected Image
</ins><span class="cx"> Object Tag with border="50" px
</span><span class="cx">
</span><span class="cx"> PASS border-top-width is 50px.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttablecellinrowbeforemisnestedtextcrashcssexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-css-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-css-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-css-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> This test checks whether a particular odd arrangement of DOM nodes results in render tree consistency violations.
</span><del>-0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 xxx Whee
</del><ins>+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 xxx Whee
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttablecellinrowbeforemisnestedtextcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/fast/table/cell-in-row-before-misnested-text-crash-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> This test checks whether a particular odd arrangement of DOM nodes results in render tree consistency violations.
</span><del>-0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 xxx Whee
</del><ins>+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 xxx Whee
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttokenizerscript_extra_closeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/tokenizer/script_extra_close-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/tokenizer/script_extra_close-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/fast/tokenizer/script_extra_close-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1 +1 @@
</span><del>-TEST... PASSED. This text should show up.
</del><ins>+TEST... PASSED. This text should show up.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastxslmozillatestsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/xsl/mozilla-tests-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/xsl/mozilla-tests-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/fast/xsl/mozilla-tests-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -76,95 +76,95 @@
</span><span class="cx"> Desired Result:Red Text
</span><span class="cx"> Result:Red Text
</span><span class="cx"> Axis Identifiers (these should work, I need more test cases though)
</span><del>-Test: <xsl:if test="descendant::z">true</xsl:if>
</del><ins>+Test: <xsl:if test="descendant::z">true</xsl:if>
</ins><span class="cx"> Desired Result: true
</span><span class="cx"> Result: true
</span><del>-Test: <xsl:if test="not(descendant-or-self::no-element)">true</xsl:if>
</del><ins>+Test: <xsl:if test="not(descendant-or-self::no-element)">true</xsl:if>
</ins><span class="cx"> Desired Result: true
</span><span class="cx"> Result: true
</span><del>-Test: <xsl:value-of select="count(x/attribute::*)"/>
</del><ins>+Test: <xsl:value-of select="count(x/attribute::*)"/>
</ins><span class="cx"> Desired Result: 1
</span><span class="cx"> Result: 1
</span><span class="cx"> Creating Elements with xsl:element and xsl:attribute
</span><del>-Test: <xsl:element name="FONT">
</del><ins>+Test: <xsl:element name="FONT">
</ins><span class="cx"> <xsl:attribute name="COLOR">blue</xsl:attribute>
</span><span class="cx"> Passed
</span><span class="cx"> </xsl:element>
</span><span class="cx"> Desired Result: Passed
</span><del>-Result: Passed
</del><ins>+Result: Passed
</ins><span class="cx"> Using Attribute Sets
</span><del>-Test: <FONT xsl:use-attribute-sets="style1">
</del><ins>+Test: <FONT xsl:use-attribute-sets="style1">
</ins><span class="cx"> Passed
</span><span class="cx"> </FONT>
</span><span class="cx"> Desired Result: Passed
</span><del>-Result: Passed
-Test: <xsl:element name="FONT" use-attribute-sets="style1 style2">
</del><ins>+Result: Passed
+Test: <xsl:element name="FONT" use-attribute-sets="style1 style2">
</ins><span class="cx"> Passed
</span><span class="cx"> </xsl:element>
</span><span class="cx"> Desired Result: Passed
</span><del>-Result: Passed
</del><ins>+Result: Passed
</ins><span class="cx"> Numbering (only simple numbering currently implemented)
</span><del>-Test: <xsl:number value="4"/>
</del><ins>+Test: <xsl:number value="4"/>
</ins><span class="cx"> Desired Result: 4
</span><span class="cx"> Result: 4
</span><del>-Test: see source
-Desired Result: 1. x
</del><ins>+Test: see source
+Desired Result: 1. x
</ins><span class="cx"> 1. y
</span><span class="cx"> 1. z
</span><span class="cx"> Result: 1. x
</span><span class="cx"> 1. y
</span><span class="cx"> 1. z
</span><span class="cx"> Additive Expressions
</span><del>-Test: <xsl:value-of select="70+4"/>
</del><ins>+Test: <xsl:value-of select="70+4"/>
</ins><span class="cx"> Desired Result: 74
</span><span class="cx"> Result: 74
</span><del>-Test: <xsl:value-of select="-70+4"/>
</del><ins>+Test: <xsl:value-of select="-70+4"/>
</ins><span class="cx"> Desired Result: -66
</span><span class="cx"> Result: -66
</span><del>-Test: <xsl:value-of select="1900+70+8-4"/>
</del><ins>+Test: <xsl:value-of select="1900+70+8-4"/>
</ins><span class="cx"> Desired Result: 1974
</span><span class="cx"> Result: 1974
</span><del>-Test: <xsl:value-of select="(4+5)-(9+9)"/>
</del><ins>+Test: <xsl:value-of select="(4+5)-(9+9)"/>
</ins><span class="cx"> Desired Result: -9
</span><span class="cx"> Result: -9
</span><span class="cx"> Multiplicative Expressions
</span><del>-Test: <xsl:value-of select="7*4"/>
</del><ins>+Test: <xsl:value-of select="7*4"/>
</ins><span class="cx"> Desired Result: 28
</span><span class="cx"> Result: 28
</span><del>-Test: <xsl:value-of select="7mod 4"/>
</del><ins>+Test: <xsl:value-of select="7mod 4"/>
</ins><span class="cx"> Desired Result: 3
</span><span class="cx"> Result: 3
</span><del>-Test: <xsl:value-of select="7div 4"/>
</del><ins>+Test: <xsl:value-of select="7div 4"/>
</ins><span class="cx"> Desired Result: 1.75
</span><span class="cx"> Result: 1.75
</span><del>-Test: <xsl:value-of select="7div 0"/>
</del><ins>+Test: <xsl:value-of select="7div 0"/>
</ins><span class="cx"> Desired Result: Infinity
</span><span class="cx"> Result: Infinity
</span><del>-Test: <xsl:value-of select="0 div 0"/>
</del><ins>+Test: <xsl:value-of select="0 div 0"/>
</ins><span class="cx"> Desired Result: NaN
</span><span class="cx"> Result: NaN
</span><del>-Test: <xsl:variable name="x" select="7*3"/>
</del><ins>+Test: <xsl:variable name="x" select="7*3"/>
</ins><span class="cx"> <xsl:variable name="y" select="3"/>
</span><span class="cx"> <xsl:value-of select="$x div $y"/>
</span><span class="cx"> Desired Result: 7
</span><span class="cx"> Result: 7
</span><span class="cx"> Precedence tests
</span><del>-Test: <xsl:value-of select="2 mod 2 = 0"/>
</del><ins>+Test: <xsl:value-of select="2 mod 2 = 0"/>
</ins><span class="cx"> Desired Result: true
</span><span class="cx"> Result: true
</span><del>-Test: <xsl:value-of select="5 mod 2 < 5 and 2*6 >= 12"/>
</del><ins>+Test: <xsl:value-of select="5 mod 2 < 5 and 2*6 >= 12"/>
</ins><span class="cx"> Desired Result: true
</span><span class="cx"> Result: true
</span><del>-Test: <xsl:value-of select="5 mod 2 < 5 and 2*6>12"/>
</del><ins>+Test: <xsl:value-of select="5 mod 2 < 5 and 2*6>12"/>
</ins><span class="cx"> Desired Result: false
</span><span class="cx"> Result: false
</span><del>-Test: <xsl:value-of select="4+5*3"/>
</del><ins>+Test: <xsl:value-of select="4+5*3"/>
</ins><span class="cx"> Desired Result: 19
</span><span class="cx"> Result: 19
</span><del>-Test: <xsl:value-of select="4+5*3+(6-4)*7"/>
</del><ins>+Test: <xsl:value-of select="4+5*3+(6-4)*7"/>
</ins><span class="cx"> Desired Result: 33
</span><span class="cx"> Result: 33
</span><span class="cx"> Automatic Result Type Conversion
</span><del>-Test: <xsl:value-of select="'747' + 8"/>
</del><ins>+Test: <xsl:value-of select="'747' + 8"/>
</ins><span class="cx"> Desired Result: 755
</span><span class="cx"> Result: 755
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariagridwithstrangehierarchyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-grid-with-strange-hierarchy-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>- Name Time Popularity Price
</del><ins>+ Name Time Popularity Price
</ins><span class="cx"> 1 Test Test Test
</span><span class="cx"> This tests that an ARIA grid with a hierarchy that ignores render elements in between will still expose the correct elements.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablemultibodiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-multi-bodies-expected.txt (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-multi-bodies-expected.txt 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/LayoutTests/platform/mac/accessibility/table-multi-bodies-expected.txt 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> Forum Last Post Threads Posts
</span><span class="cx"> English Forums
</span><span class="cx"> Main Discussion
</span><del>- Want to communicate with other local fans? Do it here, too! Today 03:52pm 381 23,437
</del><ins>+ Want to communicate with other local fans? Do it here, too! Today 03:52pm 381 23,437
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/Source/WebCore/ChangeLog 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-22 Chang Shu <cshu@webkit.org>
+
+ Replace deprecatedIsCollapsibleWhitespace with RenderStyle::isCollapsibleWhiteSpace in TextIterator.
+ https://bugs.webkit.org/show_bug.cgi?id=130612.
+
+ Reviewed by Darin Adler.
+
+ Some layout tests are affected by this change but the new behavior should be correct.
+
+ * editing/TextIterator.cpp:
+ (WebCore::TextIterator::handleTextNode):
+ (WebCore::TextIterator::handleTextBox):
+
</ins><span class="cx"> 2014-03-22 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Switch HTMLConverter to use CSSPropertyIDs to refer to CSS properties
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (166133 => 166134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-03-23 01:30:29 UTC (rev 166133)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-03-23 02:43:52 UTC (rev 166134)
</span><span class="lines">@@ -556,15 +556,15 @@
</span><span class="cx"> unsigned end = (m_node == m_endContainer) ? static_cast<unsigned>(m_endOffset) : rendererText.length();
</span><span class="cx"> unsigned runEnd = m_offset;
</span><span class="cx"> unsigned runStart = m_offset;
</span><del>- while (runEnd < end && (deprecatedIsCollapsibleWhitespace(rendererText[runEnd]) || rendererText[runEnd] == '\t'))
</del><ins>+ while (runEnd < end && (renderer.style().isCollapsibleWhiteSpace(rendererText[runEnd]) || rendererText[runEnd] == '\t'))
</ins><span class="cx"> ++runEnd;
</span><del>- bool addSpaceForPrevious = m_lastTextNodeEndedWithCollapsedSpace && m_lastCharacter && !deprecatedIsCollapsibleWhitespace(m_lastCharacter);
</del><ins>+ bool addSpaceForPrevious = m_lastTextNodeEndedWithCollapsedSpace && m_lastCharacter && !renderer.style().isCollapsibleWhiteSpace(m_lastCharacter);
</ins><span class="cx"> if (runEnd > runStart || addSpaceForPrevious) {
</span><span class="cx"> if (runEnd == rendererText.length()) {
</span><span class="cx"> m_lastTextNodeEndedWithCollapsedSpace = true;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- bool addSpaceForCurrent = runStart || (m_lastCharacter && !deprecatedIsCollapsibleWhitespace(m_lastCharacter));
</del><ins>+ bool addSpaceForCurrent = runStart || (m_lastCharacter && !renderer.style().isCollapsibleWhiteSpace(m_lastCharacter));
</ins><span class="cx"> if (addSpaceForCurrent || addSpaceForPrevious) {
</span><span class="cx"> emitCharacter(' ', textNode, nullptr, runStart, runEnd);
</span><span class="cx"> m_offset = runEnd;
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> }
</span><span class="cx"> runStart = runEnd;
</span><span class="cx"> }
</span><del>- while (runEnd < end && !deprecatedIsCollapsibleWhitespace(rendererText[runEnd]))
</del><ins>+ while (runEnd < end && !renderer.style().isCollapsibleWhiteSpace(rendererText[runEnd]))
</ins><span class="cx"> ++runEnd;
</span><span class="cx"> if (runStart < end)
</span><span class="cx"> emitText(textNode, renderer, runStart, runEnd);
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx"> // Check for collapsed space at the start of this run.
</span><span class="cx"> InlineTextBox* firstTextBox = renderer.containsReversedText() ? (m_sortedTextBoxes.isEmpty() ? nullptr : m_sortedTextBoxes[0]) : renderer.firstTextBox();
</span><span class="cx"> bool needSpace = m_lastTextNodeEndedWithCollapsedSpace || (m_textBox == firstTextBox && textBoxStart == runStart && runStart);
</span><del>- if (needSpace && !deprecatedIsCollapsibleWhitespace(m_lastCharacter) && m_lastCharacter) {
</del><ins>+ if (needSpace && !renderer.style().isCollapsibleWhiteSpace(m_lastCharacter) && m_lastCharacter) {
</ins><span class="cx"> if (m_lastTextNode == &textNode && runStart && rendererText[runStart - 1] == ' ') {
</span><span class="cx"> unsigned spaceRunStart = runStart - 1;
</span><span class="cx"> while (spaceRunStart && rendererText[spaceRunStart - 1] == ' ')
</span></span></pre>
</div>
</div>
</body>
</html>