<!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>[200590] 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/200590">200590</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-05-09 13:22:58 -0700 (Mon, 09 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove testRunner.setTextAutosizingEnabled and migrate the one test that uses it
https://bugs.webkit.org/show_bug.cgi?id=157480
Reviewed by Zalan Bujtas.
Migrate the one test that used testRunner.setTextAutosizingEnabled() to window.internals.settings.setTextAutosizingEnabled()
and move it next to the other iOS text autosizing tests.
Tools:
Remove testRunner.setTextAutosizingEnabled(), which was only implemented in DumpRenderTree.
* DumpRenderTree/TestRunner.cpp:
(setTextAutosizingEnabledCallback): Deleted.
(TestRunner::staticFunctions): Deleted.
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::setTextAutosizingEnabled): Deleted.
LayoutTests:
* fast/text-autosizing/ios/textarea-auto-sizing-disable-expected.txt: Renamed from LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt.
* fast/text-autosizing/ios/textarea-auto-sizing-disable.html: Renamed from LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html.
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextautosizingiostextareaautosizingdisableexpectedtxt">trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiostextareaautosizingdisablehtml">trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasthtmltextareaautosizingdisableexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasthtmltextareaautosizingdisablehtml">trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/LayoutTests/ChangeLog 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-05-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Remove testRunner.setTextAutosizingEnabled and migrate the one test that uses it
+ https://bugs.webkit.org/show_bug.cgi?id=157480
+
+ Reviewed by Zalan Bujtas.
+
+ Migrate the one test that used testRunner.setTextAutosizingEnabled() to window.internals.settings.setTextAutosizingEnabled()
+ and move it next to the other iOS text autosizing tests.
+
+ * fast/text-autosizing/ios/textarea-auto-sizing-disable-expected.txt: Renamed from LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt.
+ * fast/text-autosizing/ios/textarea-auto-sizing-disable.html: Renamed from LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html.
+ * platform/ios-simulator/TestExpectations:
+
+2016-05-09 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Upstream some iOS text autosizing tests.
</span><span class="cx">
</span><span class="cx"> * fast/text-autosizing/ios/anonymous-block.html: Added.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiostextareaautosizingdisableexpectedtxtfromrev200589trunkLayoutTestsplatformiossimulatoriosfasthtmltextareaautosizingdisableexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable-expected.txt (from rev 200589, trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt) (0 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable-expected.txt 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+SUCCESS
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiostextareaautosizingdisablehtmlfromrev200589trunkLayoutTestsplatformiossimulatoriosfasthtmltextareaautosizingdisablehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable.html (from rev 200589, trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html) (0 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/textarea-auto-sizing-disable.html 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<html>
+<head>
+ <title>TextArea auto-sizing test</title>
+ <script type="text/javascript">
+
+ if (window.testRunner)
+ window.testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ if (!window.testRunner)
+ return;
+
+ if (!window.eventSender)
+ return;
+
+ window.internals.settings.setTextAutosizingEnabled(true);
+ window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+
+ var obj = document.getElementById('test');
+ var oldHeight = obj.offsetHeight;
+
+ eventSender.mouseMoveTo(obj.offsetLeft+10, obj.offsetTop+20);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+
+ eventSender.keyDown("\n")
+ eventSender.keyDown('A');
+ eventSender.keyDown('B');
+ eventSender.keyDown('\n');
+
+ // Textarea height shouldn't change after we add new lines.
+ document.getElementById("result").innerHTML= obj.offsetHeight == oldHeight ? 'SUCCESS' : 'FAIL';
+
+ testRunner.dumpAsText();
+ testRunner.notifyDone();
+ }
+ </script>
+</head>
+
+<body onload="doTest()">
+<textarea id="test" rows="12" style="width:100%">
+ a
+ b
+ c
+ d
+ e
+ f
+ g
+ h
+ i
+</textarea>
+<div id="result"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> platform/ios-simulator/ios/fast/forms/range-input-container-touches.html [ Skip ]
</span><span class="cx"> platform/ios-simulator/ios/fast/forms/range-input-readonly-and-disabled.html [ Skip ]
</span><span class="cx"> platform/ios-simulator/ios/fast/forms/range-input-touches.html [ Skip ]
</span><del>-platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html [ Skip ]
</del><span class="cx"> platform/ios-simulator/ios/fast/text/data-detectors/phone-disabled.html [ Skip ]
</span><span class="cx"> platform/ios-simulator/ios/fast/text/data-detectors/phone.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasthtmltextareaautosizingdisableexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable-expected.txt 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-
-SUCCESS
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasthtmltextareaautosizingdisablehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/html/textarea-auto-sizing-disable.html 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-<html>
-<head>
- <title>TextArea auto-sizing test</title>
- <script type="text/javascript">
-
- if (window.testRunner)
- window.testRunner.waitUntilDone();
-
- function doTest()
- {
- if (!window.testRunner)
- return;
-
- if (!window.eventSender)
- return;
-
- // Enable autosizing
- testRunner.setTextAutosizingEnabled(true);
-
- var obj = document.getElementById('test');
- var oldHeight = obj.offsetHeight;
-
- eventSender.mouseMoveTo(obj.offsetLeft+10, obj.offsetTop+20);
- eventSender.mouseDown();
- eventSender.mouseUp();
-
- eventSender.keyDown("\n")
- eventSender.keyDown('A');
- eventSender.keyDown('B');
- eventSender.keyDown('\n');
-
- // Textarea heigth shouldn't change after we add new lines.
- document.getElementById("result").innerHTML= obj.offsetHeight == oldHeight ? 'SUCCESS' : 'FAIL';
-
- testRunner.dumpAsText();
- testRunner.notifyDone();
- }
- </script>
-</head>
-
-<body onload="doTest()">
-<textarea id="test" rows="12" style="width:100%">
- a
- b
- c
- d
- e
- f
- g
- h
- i
-</textarea>
-<div id="result"></div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/Tools/ChangeLog 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-09 Simon Fraser <simon.fraser@apple.com>
+
+ Remove testRunner.setTextAutosizingEnabled and migrate the one test that uses it
+ https://bugs.webkit.org/show_bug.cgi?id=157480
+
+ Reviewed by Zalan Bujtas.
+
+ Migrate the one test that used testRunner.setTextAutosizingEnabled() to window.internals.settings.setTextAutosizingEnabled()
+ and move it next to the other iOS text autosizing tests.
+
+ Remove testRunner.setTextAutosizingEnabled(), which was only implemented in DumpRenderTree.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (setTextAutosizingEnabledCallback): Deleted.
+ (TestRunner::staticFunctions): Deleted.
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::setTextAutosizingEnabled): Deleted.
+
</ins><span class="cx"> 2016-05-07 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Next step on dictionary bindings, along with other bindings refinements
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -1244,19 +1244,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
-static JSValueRef setTextAutosizingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- controller->setTextAutosizingEnabled(JSValueToBoolean(context, arguments[0]));
-
- return JSValueMakeUndefined(context);
-}
-#endif
-
</del><span class="cx"> static JSValueRef setUseDashboardCompatibilityModeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> // Has mac implementation
</span><span class="lines">@@ -2146,9 +2133,6 @@
</span><span class="cx"> { "setTelephoneNumberParsingEnabled", setTelephoneNumberParsingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setPagePaused", setPagePausedCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- { "setTextAutosizingEnabled", setTextAutosizingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-#endif
</del><span class="cx"> { "setUseDashboardCompatibilityMode", setUseDashboardCompatibilityModeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setUserStyleSheetEnabled", setUserStyleSheetEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setUserStyleSheetLocation", setUserStyleSheetLocationCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (200589 => 200590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-05-09 20:22:54 UTC (rev 200589)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-05-09 20:22:58 UTC (rev 200590)
</span><span class="lines">@@ -536,13 +536,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
-void TestRunner::setTextAutosizingEnabled(bool enabled)
-{
- [[[mainFrame webView] preferences] _setTextAutosizingEnabled:enabled];
-}
-#endif
-
</del><span class="cx"> void TestRunner::setUseDashboardCompatibilityMode(bool flag)
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>