<!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>[210466] 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/210466">210466</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-01-06 18:59:12 -0800 (Fri, 06 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor cleanups to IndentOutdentCommand and related code
https://bugs.webkit.org/show_bug.cgi?id=166791
Reviewed by Simon Fraser.
Source/WebCore:
* editing/IndentOutdentCommand.cpp:
(WebCore::IndentOutdentCommand::IndentOutdentCommand):
(WebCore::IndentOutdentCommand::outdentRegion):
* editing/IndentOutdentCommand.h:
(WebCore::IndentOutdentCommand::create):
Remove the unused m_marginInPixels and fix the copyright header.
Tools:
* WebEditingTester/EditingOperations.m:
(editingOperations):
Add the outdent operation to WebEditingTester.
LayoutTests:
* editing/execCommand/19653-1-expected.txt:
* editing/execCommand/19653-1.html:
Adjust this indenting test. It had a mislabeled test case (it outdents, not indents),
and also was copy-pasted wrong (it wasn't indented in the first place).
However, since this technically reduces test coverage, keep the existing
(but now correctly labeled) test case, since it caught a bug in code I was changing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingexecCommand196531expectedtxt">trunk/LayoutTests/editing/execCommand/19653-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommand196531html">trunk/LayoutTests/editing/execCommand/19653-1.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingIndentOutdentCommandcpp">trunk/Source/WebCore/editing/IndentOutdentCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingIndentOutdentCommandh">trunk/Source/WebCore/editing/IndentOutdentCommand.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebEditingTesterEditingOperationsm">trunk/Tools/WebEditingTester/EditingOperations.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/LayoutTests/ChangeLog 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-06 Tim Horton <timothy_horton@apple.com>
+
+ Minor cleanups to IndentOutdentCommand and related code
+ https://bugs.webkit.org/show_bug.cgi?id=166791
+
+ Reviewed by Simon Fraser.
+
+ * editing/execCommand/19653-1-expected.txt:
+ * editing/execCommand/19653-1.html:
+ Adjust this indenting test. It had a mislabeled test case (it outdents, not indents),
+ and also was copy-pasted wrong (it wasn't indented in the first place).
+
+ However, since this technically reduces test coverage, keep the existing
+ (but now correctly labeled) test case, since it caught a bug in code I was changing.
+
</ins><span class="cx"> 2017-01-06 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking fast/text/variations/advances.html as failing on Sierra.
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommand196531expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/19653-1-expected.txt (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/19653-1-expected.txt 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/LayoutTests/editing/execCommand/19653-1-expected.txt 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -13,5 +13,8 @@
</span><span class="cx"> This tests outdenting an empty paragraph with bold already applied to it. The word below should be bold.
</span><span class="cx"> <b>Bold</b>
</span><span class="cx">
</span><del>-This tests indenting an empty paragraph when the typing style was Bold. The word below should be bold.
</del><ins>+This tests outdenting an empty paragraph when the typing style was Bold. The word below should be bold.
</ins><span class="cx"> <b>Bold</b>
</span><ins>+
+This tests outdenting an non-indented empty paragraph when the typing style was Bold. The word below should be bold.
+<b>Bold</b>
</ins></span></pre></div>
<a id="trunkLayoutTestseditingexecCommand196531html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/19653-1.html (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/19653-1.html 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/LayoutTests/editing/execCommand/19653-1.html 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -13,9 +13,12 @@
</span><span class="cx"> <div id="description5">This tests outdenting an empty paragraph with bold already applied to it. The word below should be bold.</div>
</span><span class="cx"> <div id="edit5" contentEditable="true"><blockquote class="webkit-indent-blockquote"><b><br></b></blockquote></div>
</span><span class="cx">
</span><del>-<div id="description6">This tests indenting an empty paragraph when the typing style was Bold. The word below should be bold.</div>
-<div id="edit6" contentEditable="true"></div>
</del><ins>+<div id="description6">This tests outdenting an empty paragraph when the typing style was Bold. The word below should be bold.</div>
+<div id="edit6" contentEditable="true"><blockquote class="webkit-indent-blockquote"><br></blockquote></div>
</ins><span class="cx">
</span><ins>+<div id="description7">This tests outdenting an non-indented empty paragraph when the typing style was Bold. The word below should be bold.</div>
+<div id="edit7" contentEditable="true"></div>
+
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> window.testRunner.dumpAsText();
</span><span class="lines">@@ -52,6 +55,12 @@
</span><span class="cx"> document.execCommand("Outdent");
</span><span class="cx"> document.execCommand("InsertText", false, "Bold");
</span><span class="cx">
</span><ins>+edit7 = document.getElementById("edit7");
+edit7.focus();
+document.execCommand("Bold");
+document.execCommand("Outdent");
+document.execCommand("InsertText", false, "Bold");
+
</ins><span class="cx"> if (window.testRunner)
</span><span class="cx"> document.body.innerText = document.getElementById("description1").innerText + "\n" + edit1.innerHTML + "\n\n" +
</span><span class="cx"> document.getElementById("description2").innerText + "\n" + edit2.innerHTML + "\n\n" +
</span><span class="lines">@@ -58,6 +67,7 @@
</span><span class="cx"> document.getElementById("description3").innerText + "\n" + edit3.innerHTML + "\n\n" +
</span><span class="cx"> document.getElementById("description4").innerText + "\n" + edit4.innerHTML + "\n\n" +
</span><span class="cx"> document.getElementById("description5").innerText + "\n" + edit5.innerHTML + "\n\n" +
</span><del>- document.getElementById("description6").innerText + "\n" + edit6.innerHTML;
</del><ins>+ document.getElementById("description6").innerText + "\n" + edit6.innerHTML + "\n\n" +
+ document.getElementById("description7").innerText + "\n" + edit7.innerHTML;
</ins><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/Source/WebCore/ChangeLog 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-06 Tim Horton <timothy_horton@apple.com>
+
+ Minor cleanups to IndentOutdentCommand and related code
+ https://bugs.webkit.org/show_bug.cgi?id=166791
+
+ Reviewed by Simon Fraser.
+
+ * editing/IndentOutdentCommand.cpp:
+ (WebCore::IndentOutdentCommand::IndentOutdentCommand):
+ (WebCore::IndentOutdentCommand::outdentRegion):
+ * editing/IndentOutdentCommand.h:
+ (WebCore::IndentOutdentCommand::create):
+ Remove the unused m_marginInPixels and fix the copyright header.
+
</ins><span class="cx"> 2017-01-06 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix WinCairo build after r210319.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingIndentOutdentCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/IndentOutdentCommand.cpp (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/IndentOutdentCommand.cpp 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/Source/WebCore/editing/IndentOutdentCommand.cpp 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><span class="cx"> * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
</span><span class="cx"> * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
</span><del>- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (IndentOutdentCommandINCLUDING, BUT NOT LIMITED TO,
</del><ins>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES INCLUDING, BUT NOT LIMITED TO,
</ins><span class="cx"> * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="lines">@@ -49,10 +49,9 @@
</span><span class="cx"> return node && (node->hasTagName(ulTag) || node->hasTagName(olTag) || node->hasTagName(blockquoteTag));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IndentOutdentCommand::IndentOutdentCommand(Document& document, EIndentType typeOfAction, int marginInPixels)
</del><ins>+IndentOutdentCommand::IndentOutdentCommand(Document& document, EIndentType typeOfAction)
</ins><span class="cx"> : ApplyBlockElementCommand(document, blockquoteTag, "margin: 0 0 0 40px; border: none; padding: 0px;")
</span><span class="cx"> , m_typeOfAction(typeOfAction)
</span><del>- , m_marginInPixels(marginInPixels)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,7 +197,7 @@
</span><span class="cx"> outdentParagraph();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> Position originalSelectionEnd = endingSelection().end();
</span><span class="cx"> VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection);
</span><span class="cx"> VisiblePosition endAfterSelection = endOfParagraph(endOfParagraph(endOfSelection).next());
</span><span class="lines">@@ -209,15 +208,15 @@
</span><span class="cx"> setEndingSelection(VisibleSelection(originalSelectionEnd, DOWNSTREAM));
</span><span class="cx"> else
</span><span class="cx"> setEndingSelection(endOfCurrentParagraph);
</span><del>-
</del><ins>+
</ins><span class="cx"> outdentParagraph();
</span><del>-
</del><ins>+
</ins><span class="cx"> // outdentParagraph could move more than one paragraph if the paragraph
</span><span class="cx"> // is in a list item. As a result, endAfterSelection and endOfNextParagraph
</span><span class="cx"> // could refer to positions no longer in the document.
</span><span class="cx"> if (endAfterSelection.isNotNull() && !endAfterSelection.deepEquivalent().anchorNode()->inDocument())
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (endOfNextParagraph.isNotNull() && !endOfNextParagraph.deepEquivalent().anchorNode()->inDocument()) {
</span><span class="cx"> endOfCurrentParagraph = endingSelection().end();
</span><span class="cx"> endOfNextParagraph = endOfParagraph(endOfCurrentParagraph.next());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingIndentOutdentCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/IndentOutdentCommand.h (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/IndentOutdentCommand.h 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/Source/WebCore/editing/IndentOutdentCommand.h 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -33,15 +33,15 @@
</span><span class="cx"> class IndentOutdentCommand : public ApplyBlockElementCommand {
</span><span class="cx"> public:
</span><span class="cx"> enum EIndentType { Indent, Outdent };
</span><del>- static Ref<IndentOutdentCommand> create(Document& document, EIndentType type, int marginInPixels = 0)
</del><ins>+ static Ref<IndentOutdentCommand> create(Document& document, EIndentType type)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new IndentOutdentCommand(document, type, marginInPixels));
</del><ins>+ return adoptRef(*new IndentOutdentCommand(document, type));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool preservesTypingStyle() const override { return true; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- IndentOutdentCommand(Document&, EIndentType, int marginInPixels);
</del><ins>+ IndentOutdentCommand(Document&, EIndentType);
</ins><span class="cx">
</span><span class="cx"> EditAction editingAction() const override { return m_typeOfAction == Indent ? EditActionIndent : EditActionOutdent; }
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtr<Element>& blockquoteForNextIndent) override;
</span><span class="cx">
</span><span class="cx"> EIndentType m_typeOfAction;
</span><del>- int m_marginInPixels;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/Tools/ChangeLog 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-06 Tim Horton <timothy_horton@apple.com>
+
+ Minor cleanups to IndentOutdentCommand and related code
+ https://bugs.webkit.org/show_bug.cgi?id=166791
+
+ Reviewed by Simon Fraser.
+
+ * WebEditingTester/EditingOperations.m:
+ (editingOperations):
+ Add the outdent operation to WebEditingTester.
+
</ins><span class="cx"> 2017-01-06 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Create a plan and a patch files for MotionMark and delete the Animometer's ones
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterEditingOperationsm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/EditingOperations.m (210465 => 210466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/EditingOperations.m 2017-01-07 02:41:24 UTC (rev 210465)
+++ trunk/Tools/WebEditingTester/EditingOperations.m 2017-01-07 02:59:12 UTC (rev 210466)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> @"moveWordLeftAndModifySelection:",
</span><span class="cx"> @"moveWordRight:",
</span><span class="cx"> @"moveWordRightAndModifySelection:",
</span><ins>+ @"outdent:",
</ins><span class="cx"> @"outline:",
</span><span class="cx"> @"pageDown:",
</span><span class="cx"> @"pageDownAndModifySelection:",
</span></span></pre>
</div>
</div>
</body>
</html>