<!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>[200534] 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/200534">200534</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-05-06 17:05:58 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
https://bugs.webkit.org/show_bug.cgi?id=157432
rdar://problem/16406720
Reviewed by Dean Jackson.
Source/JavaScriptCore:
Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
These two settings are shared with TEXT_AUTOSIZING.
Add a TextAutosizing log channel, which is useful for generated -expected.html results.
Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
without changes.
An implication of this set of changes is that the way clients enable text autosizing
has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
on iPhone only, not iPad.
Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
which will now always return 15, but had no other code that toggled this. So it's safe to just rely
on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
Test: fast/text-autosizing/ios/autosize-width.html
* Configurations/FeatureDefines.xcconfig:
* dom/Document.cpp:
(WebCore::Document::addAutoSizingNode):
* page/FrameView.cpp:
(WebCore::FrameView::layout):
* page/Settings.cpp:
(WebCore::Settings::Settings): Deleted.
(WebCore::Settings::setTextAutosizingEnabled): Deleted.
(WebCore::Settings::setTextAutosizingWindowSizeOverride): Deleted.
* page/Settings.h:
(WebCore::Settings::textAutosizingEnabled): Deleted.
(WebCore::Settings::textAutosizingWindowSizeOverride): Deleted.
* page/Settings.in:
* page/cocoa/SettingsCocoa.mm:
(WebCore::Settings::defaultMinimumZoomFontSize):
(WebCore::Settings::defaultTextAutosizingEnabled):
* platform/Logging.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::adjustComputedFontSizes):
* rendering/RenderElement.cpp:
(WebCore::includeNonFixedHeight):
(WebCore::RenderElement::adjustComputedFontSizesOnBlocks):
(WebCore::RenderElement::resetTextAutosizing):
* rendering/RenderElement.h:
* rendering/RenderObject.cpp:
(WebCore::includeNonFixedHeight): Deleted.
(WebCore::RenderObject::adjustComputedFontSizesOnBlocks): Deleted.
(WebCore::RenderObject::resetTextAutosizing): Deleted.
* rendering/RenderObject.h:
* rendering/TextAutoSizing.cpp:
(WebCore::TextAutoSizingValue::adjustNodeSizes):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setTextAutosizingEnabled):
(WebCore::InternalSettings::setTextAutosizingWindowSizeOverride):
* testing/InternalSettings.h:
Source/WebKit/ios:
Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
These two settings are shared with TEXT_AUTOSIZING.
Add a TextAutosizing log channel, which is useful for generated -expected.html results.
Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
without changes.
An implication of this set of changes is that the way clients enable text autosizing
has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
on iPhone only, not iPad.
Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
which will now always return 15, but had no other code that toggled this. So it's safe to just rely
on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
* Misc/WebUIKitSupport.mm:
(WebKitGetMinimumZoomFontSize):
Source/WebKit/mac:
Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
These two settings are shared with TEXT_AUTOSIZING.
Add a TextAutosizing log channel, which is useful for generated -expected.html results.
Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
without changes.
An implication of this set of changes is that the way clients enable text autosizing
has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
on iPhone only, not iPad.
Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
which will now always return 15, but had no other code that toggled this. So it's safe to just rely
on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
* Configurations/FeatureDefines.xcconfig:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences _setTextAutosizingEnabled:]):
(-[WebPreferences _textAutosizingEnabled]):
* WebView/WebPreferencesPrivate.h:
Source/WebKit2:
Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
These two settings are shared with TEXT_AUTOSIZING.
Add a TextAutosizing log channel, which is useful for generated -expected.html results.
Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
without changes.
An implication of this set of changes is that the way clients enable text autosizing
has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
on iPhone only, not iPad.
Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
which will now always return 15, but had no other code that toggled this. So it's safe to just rely
on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
* Configurations/FeatureDefines.xcconfig:
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _textAutosizingEnabled]):
(-[WKPreferences _setTextAutosizingEnabled:]):
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Tools:
Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
These two settings are shared with TEXT_AUTOSIZING.
Add a TextAutosizing log channel, which is useful for generated -expected.html results.
Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
without changes.
An implication of this set of changes is that the way clients enable text autosizing
has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
on iPhone only, not iPad.
Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
which will now always return 15, but had no other code that toggled this. So it's safe to just rely
on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::setTextAutosizingEnabled):
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformResetPreferencesToConsistentValues):
LayoutTests:
Enable fast/text-autosizing/ios/ on Mac and iOS
* fast/text-autosizing/ios/autosize-width-expected.html: Added.
* fast/text-autosizing/ios/autosize-width.html: Added.
* platform/ios-simulator/TestExpectations:
* platform/mac-wk2/TestExpectations:
* platform/mac/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="#trunkLayoutTestsplatformiossimulatorwk1TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCorepagecocoaSettingsCocoamm">trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingh">trunk/Source/WebCore/platform/Logging.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutoSizingcpp">trunk/Source/WebCore/rendering/TextAutoSizing.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebUIKitSupportmm">trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/text-autosizing/ios/</li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosautosizewidthexpectedhtml">trunk/LayoutTests/fast/text-autosizing/ios/autosize-width-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingiosautosizewidthhtml">trunk/LayoutTests/fast/text-autosizing/ios/autosize-width.html</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingioslineheighttextautosizingexpectedtxt">trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextautosizingioslineheighttextautosizinghtml">trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html</a></li>
<li>trunk/LayoutTests/platform/mac/fast/text-autosizing/</li>
<li>trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/</li>
<li><a href="#trunkLayoutTestsplatformmacfasttextautosizingioslineheighttextautosizingexpectedpng">trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextautosizingioslineheighttextautosizingexpectedtxt">trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsslineheighttextautosizingexpectedtxt">trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsslineheighttextautosizinghtml">trunk/LayoutTests/fast/css/line-height-text-autosizing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable fast/text-autosizing/ios/ on Mac and iOS
+
+ * fast/text-autosizing/ios/autosize-width-expected.html: Added.
+ * fast/text-autosizing/ios/autosize-width.html: Added.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Console: Variables defined with let/const aren't accessible outside of console's scope
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsslineheighttextautosizingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-Test the 'line-height' property interaction with '-webkit-text-size-adjust'.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Case without text size adjust.
-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "23px"
-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size') is "20px"
-testDivNoAdjust.style['line-height'] = '1.6'
-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "32px"
-testDivNoAdjust.style['line-height'] = '80%'
-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "16px"
-testDivNoAdjust.style['line-height'] = '12px'
-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "12px"
-Case with text size adjust.
-Platform does not support -webkit-text-size-adjust
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Test
-Test
</del></span></pre></div>
<a id="trunkLayoutTestsfastcsslineheighttextautosizinghtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/css/line-height-text-autosizing.html (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/line-height-text-autosizing.html 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/fast/css/line-height-text-autosizing.html 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-<style>
-#testDivAdjust {
- -webkit-text-size-adjust: 150%;
- font-size: 20px;
-}
-#testDivNoAdjust {
- font-size: 20px;
-}
-</style>
-</head>
-<boby>
-<div id="testDivNoAdjust">Test</div>
-<div id="testDivAdjust">Test</div>
-<script>
-description("Test the 'line-height' property interaction with '-webkit-text-size-adjust'.");
-
-debug("Case without text size adjust.");
-var testDivNoAdjust = document.getElementById("testDivNoAdjust");
-shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "23px");
-shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size')", "20px");
-evalAndLog("testDivNoAdjust.style['line-height'] = '1.6'");
-// font-size * line-height == 20px * 1.6 == 32px
-shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "32px");
-evalAndLog("testDivNoAdjust.style['line-height'] = '80%'");
-// font-size * line-height == 20px * 80% == 16px
-shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "16px");
-evalAndLog("testDivNoAdjust.style['line-height'] = '12px'");
-shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "12px");
-
-debug("Case with text size adjust.");
-var testDivAdjust = document.getElementById("testDivAdjust");
-if (window.getComputedStyle(testDivAdjust).getPropertyValue('-webkit-text-size-adjust') === "") {
- debug("Platform does not support -webkit-text-size-adjust");
-} else {
- debug("Platform supports -webkit-text-size-adjust");
- shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "normal");
- // font-size * -webkit-text-size-adjust == 20px * 150% == 30px
- shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('font-size')", "30px");
- evalAndLog("testDivAdjust.style['line-height'] = '1.6'");
- // font-size * line-height == 30px * 1.6 == 48px
- shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "48px");
-
- evalAndLog("testDivAdjust.style['line-height'] = '80%'");
- // font-size * line-height == 30px * 80% == 24px
- shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "24px");
-
- evalAndLog("testDivAdjust.style['line-height'] = '12px'");
- // line-height * -webkit-text-size-adjust == 12px * 150% == 18px
- shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "18px");
-}
-</script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosautosizewidthexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/autosize-width-expected.html (0 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/autosize-width-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/autosize-width-expected.html 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html>
+<head>
+<meta name="viewport" content="width=1024">
+<style>
+ html {
+ -webkit-text-size-adjust: none;
+ }
+ div {
+ margin-top: 10px;
+ }
+</style>
+
+<script>
+if (window.internals) {
+ window.internals.settings.setTextAutosizingEnabled(false);
+ window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+}
+</script>
+
+</head>
+<body>
+
+<div class="name" style="width: 319px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 320px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 321px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 360px;">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 400px; font-size: 23px;">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 600px; font-size: 23px;">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 980px; font-size: 23px;">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 1024px; font-size: 23px;">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingiosautosizewidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text-autosizing/ios/autosize-width.html (0 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/autosize-width.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/autosize-width.html 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html>
+<head>
+<meta name="viewport" content="width=1024">
+<style>
+ div {
+ margin-top: 10px;
+ font-size: 12pt;
+ }
+</style>
+
+<script>
+if (window.internals) {
+ window.internals.settings.setTextAutosizingEnabled(true);
+ window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+}
+</script>
+
+</head>
+<body>
+
+<div class="name" style="width: 319px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 320px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 321px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 340px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 400px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 650px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 980px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+<div class="name" style="width: 1024px">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingioslineheighttextautosizingexpectedtxtfromrev200533trunkLayoutTestsfastcsslineheighttextautosizingexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt (from rev 200533, trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt) (0 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+Test the 'line-height' property interaction with '-webkit-text-size-adjust'.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Case without text size adjust.
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "23px"
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size') is "20px"
+testDivNoAdjust.style['line-height'] = '1.6'
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "32px"
+testDivNoAdjust.style['line-height'] = '80%'
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "16px"
+testDivNoAdjust.style['line-height'] = '12px'
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "12px"
+Case with text size adjust.
+Platform does not support -webkit-text-size-adjust
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Test
+Test
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextautosizingioslineheighttextautosizinghtmlfromrev200533trunkLayoutTestsfastcsslineheighttextautosizinghtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html (from rev 200533, trunk/LayoutTests/fast/css/line-height-text-autosizing.html) (0 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/line-height-text-autosizing.html 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<style>
+#testDivAdjust {
+ -webkit-text-size-adjust: 150%;
+ font-size: 20px;
+}
+#testDivNoAdjust {
+ font-size: 20px;
+}
+</style>
+<script>
+if (window.internals) {
+ window.internals.settings.setTextAutosizingEnabled(true);
+ window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+}
+</script>
+</head>
+<boby>
+<div id="testDivNoAdjust">Test</div>
+<div id="testDivAdjust">Test</div>
+<script>
+description("Test the 'line-height' property interaction with '-webkit-text-size-adjust'.");
+
+debug("Case without text size adjust.");
+var testDivNoAdjust = document.getElementById("testDivNoAdjust");
+shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "23px");
+shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size')", "20px");
+evalAndLog("testDivNoAdjust.style['line-height'] = '1.6'");
+// font-size * line-height == 20px * 1.6 == 32px
+shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "32px");
+evalAndLog("testDivNoAdjust.style['line-height'] = '80%'");
+// font-size * line-height == 20px * 80% == 16px
+shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "16px");
+evalAndLog("testDivNoAdjust.style['line-height'] = '12px'");
+shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "12px");
+
+debug("Case with text size adjust.");
+var testDivAdjust = document.getElementById("testDivAdjust");
+if (window.getComputedStyle(testDivAdjust).getPropertyValue('-webkit-text-size-adjust') === "") {
+ debug("Platform does not support -webkit-text-size-adjust");
+} else {
+ debug("Platform supports -webkit-text-size-adjust");
+ shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "normal");
+ // font-size * -webkit-text-size-adjust == 20px * 150% == 30px
+ shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('font-size')", "30px");
+ evalAndLog("testDivAdjust.style['line-height'] = '1.6'");
+ // font-size * line-height == 30px * 1.6 == 48px
+ shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "48px");
+
+ evalAndLog("testDivAdjust.style['line-height'] = '80%'");
+ // font-size * line-height == 30px * 80% == 24px
+ shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "24px");
+
+ evalAndLog("testDivAdjust.style['line-height'] = '12px'");
+ // line-height * -webkit-text-size-adjust == 12px * 150% == 18px
+ shouldBeEqualToString("window.getComputedStyle(testDivAdjust).getPropertyValue('line-height')", "18px");
+}
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> quicklook [ Pass ]
</span><span class="cx"> http/tests/quicklook [ Pass ]
</span><span class="cx">
</span><ins>+fast/text-autosizing/ios [ Pass ]
+
</ins><span class="cx"> # <rdar://problem/22898927> Crashes in iWorkImport.framework
</span><span class="cx"> quicklook/pages.html [ Pass Crash ]
</span><span class="cx">
</span><span class="lines">@@ -2210,6 +2212,8 @@
</span><span class="cx"> fast/table/table-style-not-updated.html [ Failure ]
</span><span class="cx"> fast/table/wide-colspan.html [ Failure ]
</span><span class="cx"> fast/table/wide-column.html [ Failure ]
</span><ins>+
+# Tests designed for TEXT_AUTOSIZING, not IOS_TEXT_AUTOSIZING behavior.
</ins><span class="cx"> fast/text-autosizing/cluster-inline-block-or-table.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/text-autosizing/cluster-inline-grid-flex-box.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/text-autosizing/cluster-list-item.html [ ImageOnlyFailure ]
</span><span class="lines">@@ -2257,6 +2261,7 @@
</span><span class="cx"> fast/text-autosizing/wide-child.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/text-autosizing/wide-iframe.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/text-autosizing/wide-in-narrow-overflow-scroll.html [ ImageOnlyFailure ]
</span><ins>+
</ins><span class="cx"> fast/text/decorations-transformed.html [ Failure ]
</span><span class="cx"> fast/text/emphasis-avoid-ruby.html [ Failure ]
</span><span class="cx"> fast/text/emphasis-overlap.html [ Failure ]
</span><span class="lines">@@ -2559,7 +2564,7 @@
</span><span class="cx"> ###
</span><span class="cx"> # Mark as passing specific tests in folders that were skipped temporarily above.
</span><span class="cx"> ##
</span><del>-webkit.org/b/138970 fast/css/line-height-text-autosizing.html [ Pass ]
</del><ins>+webkit.org/b/138970 fast/text-autosizing/ios/line-height-text-autosizing.html [ Pass ]
</ins><span class="cx">
</span><span class="cx"> # Skipped for mac as well:
</span><span class="cx"> webkit.org/b/129758 js/dom/create-lots-of-workers.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -793,7 +793,7 @@
</span><span class="cx"> # LayoutTests/fast tests that fail:
</span><span class="cx"> fast/block/min-max-height-percent-height-child.html [ Failure ]
</span><span class="cx"> fast/borders/hidpi-border-clipping-right-after-move.html [ ImageOnlyFailure ]
</span><del>-fast/css/line-height-text-autosizing.html [ Failure ]
</del><ins>+fast/text-autosizing/ios/line-height-text-autosizing.html [ Failure ]
</ins><span class="cx"> fast/css/nested-rounded-corners.html [ Failure ]
</span><span class="cx"> fast/css/relative-positioned-block-crash.html [ Failure ]
</span><span class="cx"> fast/css/sticky/sticky-overflowing.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> fast/css/hover-display-block-inline.html [ Failure ]
</span><span class="cx"> fast/css/hover-display-block-none.html [ Failure ]
</span><span class="cx"> fast/css/hover-display-block.html [ Failure ]
</span><del>-fast/css/line-height-text-autosizing.html [ Failure ]
</del><ins>+fast/text-autosizing/ios/line-height-text-autosizing.html [ Failure ]
</ins><span class="cx"> fast/css/nested-layers-with-hover.html [ Failure ]
</span><span class="cx"> fast/dom/HTMLDocument/hasFocus.html [ Failure ]
</span><span class="cx"> fast/dom/Window/Plug-ins.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx">
</span><span class="cx"> fast/url/user-visible [ Pass ]
</span><span class="cx">
</span><ins>+fast/text-autosizing/ios [ Pass ]
+
</ins><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End platform-specific directories.
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextautosizingioslineheighttextautosizingexpectedpng"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.png (0 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.png (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.png 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+\x89PNG
+
++IHDR X\x9Av\x82p)tEXtchecksumc9446ffb7b6992decb1bfc50d4e9cab3\xD3n1"sRGB\xAE\xCE \xE93IDATx\xED\xDD{\xCC\xFEs\xFD\xF07rꀒP\xA9\xA54d\x86Jcʡ\xFAN\xB6\x8A)Vm-\x93\x90\xD6V6\xDA:\xC8\xCABM\x87\xD5V\x9At\xD0A\xEB\xB4Ul\xCA\xAAu\xA00ѲF\x869\xF4\xA5_\x9F\xCFv\xDF\xF3\xCDW7\xE2\xF6\xF4\xFC=>[\xEE뾮\xEB\xBE\xEF\xD7\xEB\xF1\xFC\xFE\xD1s\xD7\xF5\xF9\k\xFC\xEB\xDF\xC7p @\x80 @`\xD6\\x86\xBF\xE1O @\x80 @`P@\xFCC @\x80 @`\xD9\x90e\xA3\xF6\x87 @\x80P@\xFC @\x80 @`\xD9\x90e\xA3\xF6\x87 @\x80P@\xFC @\x80 @`\xD9\x90e\xA3\xF6\x87 @\x80P@\xFC @\x80 @`\xD9\x90e\xA3\xF6\x87 @\x80P@\xFC @\x80 @`\xD9\x90e\xA3\xF6\x87 @\x80x\xC2RW^y\xE5\xF8\xEB_\xFF\xBA\xD4\xD3\xE6ǟ\x{1B49CD}m\xB6\xD9\xE6A=ד @\x80\xF8\xFF'\xB0ƿ\xFE}\xFC\xB7\xB5\xDF\xFAַ\x8E\xAF}\xEDkc\xD7]w [n\xB9\xE5X\xFD\xF5\xC7)\xA7\x9C2V\xAE\9>\xF8\xE0\xF9\xEB5\xD7\3\xCE;ＱbŊq\xF6
\xD9g\xFF\xB7_\xE71 @\x80\xFE ,Y@\xDE\xF8\xC67\x8E}\xF6\xD9g t\xD0A\x8BLOzғ\xC6?\xFE\xF1\x8Fq\xE7\x9Dw\x8Eu\xD7]w\xBE\xFF\xFB\xDF\xFF\xFE8\xF9\xE4\x93ǹ瞻\xF8\xBC\x87{\xE3\xB2\xCB.\x9Bo\xBE\xF9\xD8p\xC3+ \xEE\xAF\xF0s @\x80
+,y\xC8z\xEB\xAD7\xA6WA\x96:\xF6\xDDw\xDF\xF1\x8Cg<c\xA9\xA7-\xF9\xF8Tl\xA6\xD2s뭷.\xF9\O @\x80 @\xE0\xF1%\xB0d9餓\xC6Zk\xAD\xF5\xA0\xB6\xFA\xCCg>\xB3\xF8\xBC\xDBn\xBBm\xDCp\xC3+\x8B\xDF\xFF獻\xEF\xBE{\z\xE9\xA5㮻\xEE\xF7\xDE{\xEF\xFC\xF0t\xFB\xC0 \x97\rɘ\xDE\xB6Ļ\xC3\xFE\xF3W\xFA\x9E @\x80\x81p\x81%OB\xDFd\x93M \xF4
+\xD3s\xAF\xB8\xE2\x8A\xF1я~tLo\xD3\xFA\xE9O:\xBFEk:gd\xC7 w\\xFC= \xFC\xE0\xE7\xB7Wm\xB5\xD5V㨣\x8E\x9A\x9Fs\xC6g\x8C\xAF|\xE5+\xE3w\xBF\xFB\xDD\xFC\xBC\xB7\xBF\xFD\xED\xF3\xFD\xD3\xF9'ފ\xB5H\xE7 @\x80\x81ǵ\xC0\x92瀬n\xBB՝2=o:}\xBF\xFD\xF6\xE7\x9Cs\xCE\n\xBF\xFD\xF6\xB1\xED\xB6ێ\xFE\xF3\x9F\xF3\xAB O}\xEAS\xC7\xE5\x97_>^\xFF\xFA\xE9<\x8F\xE9\x98\xCE#y\xCB[\xDE2\xA62 \x87 ~\xF8\xF8\xC2\xBE0\xAE\xBB馛\xCE\xF7\xF9 @\x80 K\xBE롬9\xBD\xB2\xB1\xCB.\xBB\x8Co\xBCq\u\xD5U\xF3\xE5{_\xFAҗ\x8Ek\xAF\xBDv\x9Cu\xD6Y\xF3\xAF\xBA\xF0\xC2 \xC7ti\xDF .\xB8`\xFE~:\xC7\xE4\x90C\xB9ߟYc\x8D5\xEEw\x9F; @\x80x| ,\xF9\xAC\x87\xB2ޙg\x9E9\xF6\xD8c\x8F\xF9\xB2\xBD ?\xB7\xFD\xF6ۏ\xE9\xCF}\xEEs\xE7\xBB^\xF7\xBA\xD7͗\xF2\xDD}\xF7\xDDǑG 9\x8E>\xFA\xE8\xB1\xF7\xDE{/<}\xF1\xAB\xB2H\xE1 @\x80\x81\x81G\xAC\x80\xDC|\xF3\xCD㦛n;\xED\xB4\xD38\xE6\x98c h\xA3\x8D6]t\xD1|\xB2\xF9 '\x9C0N?\xFD\xF4\xF1\xDD\xEF~w\xBC\xECe/{\xC0\x9F\xF1
@\x80 \x8F\xD8[\xB06\xD8`\x83\xB1\xCE:\xEB\x8C\xE9-V\xAB;\xA6\xB7eM\xC7t\xF5\xAB\xE9\xD3ҧr\xEC\xB1ǎ믿~L\xAF\x86L_\xEF{x\xE4\xBEn @\x80\xE8xXdᲹ\xF7\xBDL\xEE\x9Ak\xAE9v\xDEy\xE71\xBD+\xEB?K\xC8\xD5W_=\xBE\xFE\xF5\xAF\xCFb\x9F\xFD\xECg\xE7\xCB\xF3N\xE7~L\xE7\x8CL `8]~w\xFA\xB9\xE9\x98~\xCFtLE\xC5A\x80 @\x80@\x97\xC0C. \xD3\xE7{LW\xAE\x9A\x8E\x85W5H\xA6B1\x95\x92+V\x8CO\xFA\xD3\xE3\xFC\xF3\xCF \xC7 \xFCx\xF7\xBB\xDF==\xF4\xD0\xF9i+W\xAE\x9C/\xB7\xBB\xF03Si\x99J\xC7\xD6[o=\xDF\xF5\x9C\xE7<g\xFE:\x92\xE9o]|\xF1\xC5 O\xF5\x95 @\x80\x81ǹ\xC0C\xBA \xEFi\xA7\x9D6\x9F\xB3q\xF6\xD9g\xCFk\xEF\xB5\xD7^c\xFF\xFD\xF7 \xEF|\xE7;N=\xF5\xD4q\xC4G\x8C\xE9\xBCӱ\xDBn\xBBͅ\xE3/x\xC1\xFC\xFD\x89'\x9E8>\xF7\xB9ύ8`\xEC\xB0\xC3\xF3\xE7~l\xB1\xC5\xE3\xB0\xC3\x9B \x9F>Gd\xBAr\xD6\xF4I\xE8o~\xF3\x9BǗ\xBE\xF4\xA5\xF9\xA4\xF5\xF9A\xFF!@\x80 @\xE0q-\xF0\x90
+ȃ\xDD\xF4\x9E{\xEE\x99?\xE7c\xE3\x8D7 \x9Bm\xB6\xD9*?6}&\xC8\xDAk\xAF=n\xB9\xE5\x96\xF9\x8Eg=\xEBY\xAB<>}3\xBD\xC22\x9D\xD4\xFE\x9F?{\xBF'\xBA\x83 @\x80\x81Ǖ\xC0\xA3R@ W\x86%@\x80 @`\xD9 \xF29 \xCB6\x99?D\x80 @\x80@\x9D\x80R\xA9\x85 @\x80\xE4
+( \xB9٘\x8C @\x80@\x9D\x80R\xA9\x85 @\x80\xE4
+( \xB9٘\x8C @\x80@\x9D\x80R\xA9\x85 @\x80\xE4
+( \xB9٘\x8C @\x80@\x9D\x80R\xA9\x85 @\x80\xE4
+( \xB9٘\x8C @\x80@\x9D\x80R\xA9\x85 @\x80\xE4
+( \xB9٘\x8C @\x80@\x9D\xC0\x96\xDA\xE8\xB4\xD3N \xFB\xD8ǖz\xDA}\xFC\xE0\x83 \xF8\xC0\xFE\xEBs<H\x80 @\x80@\xBF\xC0\x92\xE4\xBA\xEB\xAEW\q\xC5Xs\xCD5\xC7k^\xF3\x9A\xB1\xE3\x8E;\x8EM6\xD9d\xAC\xBF\xFE\xFA\xE3\xC7?\xFE\xF1\xF8\xF6\xB7\xBF=+\xADX\xB1b\xBC\xE1+ow\xDDu\xE1\x86\xC6\xE5\x97_>\xBE\xF7\xBD\xEF\xBE{\s\xCD5\xFD\x926$@\x80 @`I\x81% \xC8 w\xDC1\x97\x8Fs\xCE9g\xEC\xB1\xC7 \xAB\xFC\xC2\xDBo\xBF}\xB1\x80l\xBF\xFD\xF6\xE3\x90CY\xE5\xF1?\xFC\xE1c\xA7\x9Dvw\xDEy\xE7*\xF7?\xDA\xDF\u\xD5Uc\xCB-\xB7|\xB4\xFF\x8C\xDFO\x80 @\x80\xC0CX\xF2 \x90\xA9\x80 p\xC0\xF7+ \xE6\xEFl\xB3\xCD6\xE3\xD0C]\xD6r\xDEy獣\x8F>\xFA\xC1\x8C\xE79 @\x80,\xB3\xC0\x83* \xAF}\xEDk \xF6X\xFB\xED\xB7߲\x90\xE9\xEDbozӛ\xC6ʕ+ \xF6\xBC~\x90 @\x80\x81GO`ɷ` q\xC4\xE3\x99\xCF|\xE6Þ`\xB7\xDDvo\xBC\xF1\xC3\xFE\xF9\xFB\x83\xB7\xDEz\xEB\x98\xCAε\xD7^\xFB`\xC4\xF3 @\x80Xf\x81% \xC8V[m\xF5?\x8D\xB4\xD6Zk\x8D\xED\xB6\xDBn\xF1w\|\xF
1\xC5\xE3'?\xF9ɘ\xBEN'\xB2O'\xB5 t\xD0A\xE3)Oy\xCA\xE2s\xEE{\xE3\x96[n\x9F\xFC\xE4'\xC7/\xF9\xCB\xF9\xEEg?\xFB\xD9c\xF7\xDDw\x9F_\xE5x\xDB\xDB\xDE6\xDFw\xFD\xF5\xD7\xCF'\xC8\xFF\xEAW\xBF\x9A\xBF\xFF\xFD\xEF?>\xF4\xA1ͷw\xD8a\x87\xB9\x98\xCC\xDF\xF8 @\x80\x8F\xA9\xC0\x92o\xC1z\xA4\xA6\xBB\xE7\x9E{\xC6QG 5\xA6WT\xEE\xBD\xF7ޱ\xCB.\xBB\x8C\xE9d\xF1\xF7\xBE\xF7\xBDc\xDBm\xB7 \xE7\x9E{\xEE\xFD\xFE\xD4\xF4j\xC6\xF4\xD8T0N=\xF5\xD4q\xD6Yg\xCDo\xB1z\xCF{\xDE3\x8E;\xEE\xB8\xC5\xE7_p\xC1c\xCF=\xF7 O~\xF2\x93\xEF\x9BN\x90\x9F\xFE7]\x95\xCBA\x80 @\x80@\x86\xC0\x92\xAF\x80<Rc x\xE0\x81\xE3\xC6o\x9C_\xFDXo\xBD\xF5\xE6_;\x95\x91}\xF6\xD9g\xFC\xE8G?\x9A/\xE1{\xC9%\x97\xAC\xF2v\xAF\xF7\xBD\xEF}\xF3%}?\xFE\xF1\x8F/\xBE\x8Dk\xAF\xBD\xF6\xA7\x9F~\xFA*W\xDC\xDAw\xDF}\xC7\xF4\xBFo}\xEB[\xE3\xB6\xDBn/~\xF1\x8B\xC7 '\x9C\xF0H\x8D\xEE\xF7 @\x80 \xF0 ,\xCB+ ?\xF8\xC1\xC6g\x9C1\x8E=\xF6رP>\xA6\xF9\x9F\xF0\x84'\x8C\x85\xB7Q\xFD\xEDo\xC7 s\xCC*kMo՚^-\x99&g
t;K\xE4\xBEǫ_\xFD\xEA\xB1\xD9f\x9B\xDD\xF7\xAEUn\xAF\xB1\xC6\xAB|\xEF @\x802\x96\xE5\x90\xF7\xBF\xFF\xFDc\xC3+7\x9C\xCB\xC7¹ \xEBo\xB0\xC1 7\xC7E]\xB4x{\xBA\xB1\xF6\xDAk\xCF\xE7z\xBC\xE3 \xEF\xD3'\xB2o\xB4\xD1F\xF3\xE3S\xC1\xF8\xC8G>\xB2\xCAs}C\x80 @\x80@\xBE\xC0\xA3^@\xA6\xF38.\xBD\xF4ҹ<L瀬\xEE\x98\xDEV5 묳\xCE\xF8\xFE5^\xC1\xD8\xFF\xFD\xC7I'\x9D4\xCE<\xF3\xCC\xF9d\xF5O}\xEAS\xF3[\xAD\xA6\xE7\xEE\xBD\xF7\xDEӗ\xD5 ?\xBF\xDA\xDDI\x80 @\x80\xC0c&\xF0\xA8\x90\xE9\xD3Ч\xE3\xE9O\xFA\x98>M\xFD\xA1 ӫ \xBF\xF8\xC5/\xE6\xF3F\xFE\xF4\xA7?\xCDW\xB3\xDAu\xD7]\xC7W\xBF\xFA\xD5\xF1\xFC\xE7?\xFF\x95\xF2\x804 @\x80 \xF0\x98
+<\xEA\xE7\x80\xFC\xF9\xCF\x9E\xBC\xFA\xEA\xAB\xEFw.\xC7R\x9BOW\xB5\xFA\xE18_=k:_d:\xA6+^\xBD\xE4%/\x99\xAF\x88\xF5@?\xAF\x80<\x90\x8C\xFB @\x80<\xB6\x8Fz\xD9b\x8B-\xE6+\xA7\xCB\xF0N\x9F\xCF\xF1P\x8Fu\xD7]w|\xE2\x9F\xBF\xFE\xF5\xAF\xC7t\xF2\xF9t\xDC|\xF3\xCDc\xFAt\xF6\xE9$\xF5\xD5
+\xC8\xEAT\xDCG\x80 @\xE0\xB1x\xD4 \xC8}?\xC8\xF0\xC4O\xFC\xAF_x\xE1\x85\xF3۫\x9E4\x9Dx\xBEp\xBC\xE8E/\x9A_+\xF9\xE2\xBF8_=k:W\xE4\xCB_\xFE\xF2\xC2ë|U@V\xE1\xF0+ @\x80\x81\x81\xFF\xA9\x80\xAC\\xB9rq\x91\xA9\xAC\xEEx\xCEs\x9E3v\xDAi\xA7\xF9\xA1o|\xE3\xE3\xE7?\xFF\xF9\xEA\x9E6\xA6s<\xA6\xCF
+Y\xB1b\xC5\xE2\xE3\xD39 \xF7\xFD\xD3\xD3\xB1\xAE\x80u\xDEy\xE7->w\xBA1\x9D\xC4> ӧ\xA7; @\x80\xC8\xF8\x9F
+\xC8\xF4\xD9 \xC7M7ݴp\xF3~_?\xFC\xE1\xCF\xF7M\x9F\xE91]\xF1\xEA\x94SNY\xE5|\x90\xA9\x94L Hx\xE4\x91G\xAE\xF2\xF9 \xD3'\xA0O R\xF8\x9F\xC7t\xC8tl\xB7\xDDv\xAB<\xF4\xBC\xE7=o\xFE\xFE\xCA+\xAF\\xBC\xFA\xF0\xC3\xFBι\xF8\x80 @\x80,\xBB\xC0\xC3. \xD3+\xF7\xBD\xAA\xD5\xF9矿J\xA9\xB8\xEF&\xD3\xF9 t\xD0|\xD7 w\xDC1>\xF8\xE0\xF9sA\xA6WF\xA6sDv\xD9e\x97\xB1\xE7\x9E{\xCE\xE4\xBE?7\xDD>\xFC\xF0\xC3\xC7UW]\xB5\xCA\xDD\xDF\xFC\xE67\xC7tn\xC8B\xB1Yxpz\x9B\xD6t\xFC\xE67\xBF\xEFz\xC6\xE7?\xFF\xF9\xF9\x93\xA9\xF88 @\x80x\xEC\xD6\xF8\xF7[\xA7V\xFFީ\x98\xED\xB2\xCB.\x9B\xFF\x8F\xFF\xCF~\xF6\xB3\xB1p\x85\xAB\x85\xA7n\xBA\xE9\xA6\xE3\xE5/\xF98\xEC\xB0\xC3\xC6+_\xF9ʅ\xBB\xBF w\xDCq\xE3\xF8\xE3\x8F \xFF\xFB\xDF\xEF\x9B~\xE6\xE4\x93O p\xC0\xE2} 7\xB6\xD9f\x9B\xF1\xC4'>q\xFC\xE5/\x99ߚ\xF5\xC2\xBEp\xBE\xFA\xD5\xF4\xC9\xE8\xD3g\x82\xBC\xE2\xAFXx\xEA\xFC\xF5\x86n;\xEF\xBC5 \xAFzի\xC6w\xBE\xF3\x9D\xC50\x9C\xEF\xF4 @\x80 3\x81\
x87\@\xFE\xD7I\xA7W#\xA6\xCF\x99J\xC2\xD6[o=\xB6\xDCr˱暫!\xE6\xB6\xDBnӥx\xEF\xBA\xEB\xAE\xF1\xC7?\xFEq~+\xD5\xF4\xFC\xCD7\xDF\xFCǘ~\xFFo\xFB\xDB\xF9\xAD\\x9Bm\xB6\xD9>\xCF @\x80,\xBF\xC0\xB2\x90\xE5_\xD1_$@\x80 @ E`\xF5/=\xA4Lg @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90
\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80
\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE
\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80
@ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xA
A8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80
\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC
7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @
[@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-
C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\x
AA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t
@\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@
\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x
80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA
\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t
@\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC
9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\x90\xAA8-C\x80 @ [@\xC9\xCE\xC7t @\x80\xAA\xFEBs\xE5\x8A\xDF\xED(IEND\xAEB`\x82
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextautosizingioslineheighttextautosizingexpectedtxtfromrev200533trunkLayoutTestsfastcsslineheighttextautosizingexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt (from rev 200533, trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt) (0 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text-autosizing/ios/line-height-text-autosizing-expected.txt 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+Test the 'line-height' property interaction with '-webkit-text-size-adjust'.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Case without text size adjust.
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "23px"
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size') is "20px"
+testDivNoAdjust.style['line-height'] = '1.6'
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "32px"
+testDivNoAdjust.style['line-height'] = '80%'
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "16px"
+testDivNoAdjust.style['line-height'] = '12px'
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "12px"
+Case with text size adjust.
+Platform supports -webkit-text-size-adjust
+FAIL window.getComputedStyle(testDivAdjust).getPropertyValue('line-height') should be normal. Was 36px.
+PASS window.getComputedStyle(testDivAdjust).getPropertyValue('font-size') is "30px"
+testDivAdjust.style['line-height'] = '1.6'
+PASS window.getComputedStyle(testDivAdjust).getPropertyValue('line-height') is "48px"
+testDivAdjust.style['line-height'] = '80%'
+PASS window.getComputedStyle(testDivAdjust).getPropertyValue('line-height') is "24px"
+testDivAdjust.style['line-height'] = '12px'
+PASS window.getComputedStyle(testDivAdjust).getPropertyValue('line-height') is "18px"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Test
+Test
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -8,6 +8,8 @@
</span><span class="cx"> tiled-drawing [ Pass ]
</span><span class="cx"> swipe [ Pass ]
</span><span class="cx">
</span><ins>+fast/text-autosizing/ios [ Pass ]
+
</ins><span class="cx"> fast/events/cancelled-force-click-link-navigation.html [ Pass ]
</span><span class="cx"> fast/events/force-click-link-selection-behavior.html [ Pass ]
</span><span class="cx"> fast/events/force-click-on-link-navigation.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Console: Variables defined with let/const aren't accessible outside of console's scope
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx">
</span><del>-ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
</del><ins>+ENABLE_IOS_TEXT_AUTOSIZING = ENABLE_IOS_TEXT_AUTOSIZING;
</ins><span class="cx"> ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
</span><span class="cx">
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
+
+ Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
+ preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
+ These two settings are shared with TEXT_AUTOSIZING.
+
+ Add a TextAutosizing log channel, which is useful for generated -expected.html results.
+
+ Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
+ without changes.
+
+ An implication of this set of changes is that the way clients enable text autosizing
+ has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
+ Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
+ on iPhone only, not iPad.
+
+ Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
+ instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
+
+ UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
+ which will now always return 15, but had no other code that toggled this. So it's safe to just rely
+ on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
+
+ Test: fast/text-autosizing/ios/autosize-width.html
+
+ * Configurations/FeatureDefines.xcconfig:
+ * dom/Document.cpp:
+ (WebCore::Document::addAutoSizingNode):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings): Deleted.
+ (WebCore::Settings::setTextAutosizingEnabled): Deleted.
+ (WebCore::Settings::setTextAutosizingWindowSizeOverride): Deleted.
+ * page/Settings.h:
+ (WebCore::Settings::textAutosizingEnabled): Deleted.
+ (WebCore::Settings::textAutosizingWindowSizeOverride): Deleted.
+ * page/Settings.in:
+ * page/cocoa/SettingsCocoa.mm:
+ (WebCore::Settings::defaultMinimumZoomFontSize):
+ (WebCore::Settings::defaultTextAutosizingEnabled):
+ * platform/Logging.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::adjustComputedFontSizes):
+ * rendering/RenderElement.cpp:
+ (WebCore::includeNonFixedHeight):
+ (WebCore::RenderElement::adjustComputedFontSizesOnBlocks):
+ (WebCore::RenderElement::resetTextAutosizing):
+ * rendering/RenderElement.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::includeNonFixedHeight): Deleted.
+ (WebCore::RenderObject::adjustComputedFontSizesOnBlocks): Deleted.
+ (WebCore::RenderObject::resetTextAutosizing): Deleted.
+ * rendering/RenderObject.h:
+ * rendering/TextAutoSizing.cpp:
+ (WebCore::TextAutoSizingValue::adjustNodeSizes):
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setTextAutosizingEnabled):
+ (WebCore::InternalSettings::setTextAutosizingWindowSizeOverride):
+ * testing/InternalSettings.h:
+
</ins><span class="cx"> 2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Console: Variables defined with let/const aren't accessible outside of console's scope
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx">
</span><del>-ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
</del><ins>+ENABLE_IOS_TEXT_AUTOSIZING = ENABLE_IOS_TEXT_AUTOSIZING;
</ins><span class="cx"> ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
</span><span class="cx">
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -5280,8 +5280,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><ins>+
</ins><span class="cx"> void Document::addAutoSizingNode(Node* node, float candidateSize)
</span><span class="cx"> {
</span><ins>+ LOG(TextAutosizing, " addAutoSizingNode %p candidateSize=%f", node, candidateSize);
+
</ins><span class="cx"> TextAutoSizingKey key(&node->renderer()->style());
</span><span class="cx"> auto addResult = m_textAutoSizedNodes.ensure(WTFMove(key), [] {
</span><span class="cx"> return TextAutoSizingValue::create();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1402,11 +1402,17 @@
</span><span class="cx"> ASSERT(m_layoutPhase == InRenderTreeLayout);
</span><span class="cx">
</span><span class="cx"> root->layout();
</span><ins>+
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><del>- if (Page* page = frame().page()) {
</del><ins>+ if (frame().settings().textAutosizingEnabled() && !root->view().printing()) {
</ins><span class="cx"> float minimumZoomFontSize = frame().settings().minimumZoomFontSize();
</span><del>- float textAutosizingWidth = page->textAutosizingWidth();
- if (minimumZoomFontSize && textAutosizingWidth && !root->view().printing()) {
</del><ins>+ float textAutosizingWidth = frame().page() ? frame().page()->textAutosizingWidth() : 0;
+ if (int overrideWidth = frame().settings().textAutosizingWindowSizeOverride().width())
+ textAutosizingWidth = overrideWidth;
+
+ LOG(TextAutosizing, "Text Autosizing: minimumZoomFontSize=%.2f textAutosizingWidth=%.2f", minimumZoomFontSize, textAutosizingWidth);
+
+ if (minimumZoomFontSize && textAutosizingWidth) {
</ins><span class="cx"> root->adjustComputedFontSizesOnBlocks(minimumZoomFontSize, textAutosizingWidth);
</span><span class="cx"> if (root->needsLayout())
</span><span class="cx"> root->layout();
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -185,13 +185,7 @@
</span><span class="cx"> , m_minimumDOMTimerInterval(DOMTimer::defaultMinimumInterval())
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx"> , m_textAutosizingFontScaleFactor(1)
</span><del>-#if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
- , m_textAutosizingWindowSizeOverride(320, 480)
- , m_textAutosizingEnabled(true)
-#else
- , m_textAutosizingEnabled(false)
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> SETTINGS_INITIALIZER_LIST
</span><span class="cx"> , m_isJavaEnabled(false)
</span><span class="cx"> , m_isJavaEnabledForLocalFiles(true)
</span><span class="lines">@@ -326,26 +320,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><del>-void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
-{
- if (m_textAutosizingEnabled == textAutosizingEnabled)
- return;
-
- m_textAutosizingEnabled = textAutosizingEnabled;
- if (m_page)
- m_page->setNeedsRecalcStyleInAllFrames();
-}
-
-void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizingWindowSizeOverride)
-{
- if (m_textAutosizingWindowSizeOverride == textAutosizingWindowSizeOverride)
- return;
-
- m_textAutosizingWindowSizeOverride = textAutosizingWindowSizeOverride;
- if (m_page)
- m_page->setNeedsRecalcStyleInAllFrames();
-}
-
</del><span class="cx"> void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
</span><span class="cx"> {
</span><span class="cx"> m_textAutosizingFontScaleFactor = fontScaleFactor;
</span><span class="lines">@@ -359,7 +333,18 @@
</span><span class="cx">
</span><span class="cx"> m_page->setNeedsRecalcStyleInAllFrames();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+float Settings::defaultMinimumZoomFontSize()
+{
+ return 15;
+}
+
+#if !PLATFORM(IOS)
+bool Settings::defaultTextAutosizingEnabled()
+{
+ return false;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void Settings::setMediaTypeOverride(const String& mediaTypeOverride)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/page/Settings.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -109,17 +109,13 @@
</span><span class="cx"> WEBCORE_EXPORT const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><del>- void setTextAutosizingEnabled(bool);
- bool textAutosizingEnabled() const { return m_textAutosizingEnabled; }
-
</del><span class="cx"> void setTextAutosizingFontScaleFactor(float);
</span><span class="cx"> float textAutosizingFontScaleFactor() const { return m_textAutosizingFontScaleFactor; }
</span><del>-
- // Only set by Layout Tests, and only used if textAutosizingEnabled() returns true.
- void setTextAutosizingWindowSizeOverride(const IntSize&);
- const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutosizingWindowSizeOverride; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT static bool defaultTextAutosizingEnabled();
+ WEBCORE_EXPORT static float defaultMinimumZoomFontSize();
+
</ins><span class="cx"> // Only set by Layout Tests.
</span><span class="cx"> WEBCORE_EXPORT void setMediaTypeOverride(const String&);
</span><span class="cx"> const String& mediaTypeOverride() const { return m_mediaTypeOverride; }
</span><span class="lines">@@ -290,10 +286,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setForcePendingWebGLPolicy(bool);
</span><span class="cx"> bool isForcePendingWebGLPolicy() const { return m_forcePendingWebGLPolicy; }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- WEBCORE_EXPORT static float defaultMinimumZoomFontSize();
-#endif
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <WebKitAdditions/SettingsGettersAndSetters.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -314,8 +306,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx"> float m_textAutosizingFontScaleFactor;
</span><del>- IntSize m_textAutosizingWindowSizeOverride;
- bool m_textAutosizingEnabled : 1;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SETTINGS_MEMBER_VARIABLES
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/page/Settings.in 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -197,8 +197,14 @@
</span><span class="cx"> useLegacyBackgroundSizeShorthandBehavior initial=false
</span><span class="cx"> fixedBackgroundsPaintRelativeToDocument initial=defaultFixedBackgroundsPaintRelativeToDocument
</span><span class="cx">
</span><del>-minimumZoomFontSize type=float, initial=15, conditional=IOS_TEXT_AUTOSIZING
</del><ins>+textAutosizingEnabled initial=false, setNeedsStyleRecalcInAllFrames=1, conditional=TEXT_AUTOSIZING
+textAutosizingEnabled initial=defaultTextAutosizingEnabled(), setNeedsStyleRecalcInAllFrames=1, conditional=IOS_TEXT_AUTOSIZING
</ins><span class="cx">
</span><ins>+textAutosizingWindowSizeOverride type=IntSize, setNeedsStyleRecalcInAllFrames=1, conditional=TEXT_AUTOSIZING
+textAutosizingWindowSizeOverride type=IntSize, setNeedsStyleRecalcInAllFrames=1, conditional=IOS_TEXT_AUTOSIZING
+
+minimumZoomFontSize type=float, initial=defaultMinimumZoomFontSize(), conditional=IOS_TEXT_AUTOSIZING
+
</ins><span class="cx"> simpleLineLayoutEnabled initial=true, setNeedsStyleRecalcInAllFrames=1
</span><span class="cx"> simpleLineLayoutDebugBordersEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaSettingsCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -111,12 +111,10 @@
</span><span class="cx"> setSerifFontFamily("Times", USCRIPT_COMMON);
</span><span class="cx"> setSansSerifFontFamily("Helvetica", USCRIPT_COMMON);
</span><span class="cx"> }
</span><del>-
-float Settings::defaultMinimumZoomFontSize()
</del><ins>+
+bool Settings::defaultTextAutosizingEnabled()
</ins><span class="cx"> {
</span><del>- if (deviceHasIPadCapability() && ![[getUIApplicationClass() sharedApplication] _isClassic])
- return 0;
- return 15;
</del><ins>+ return !deviceHasIPadCapability() || [[getUIApplicationClass() sharedApplication] _isClassic];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/platform/Logging.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> M(Scrolling) \
</span><span class="cx"> M(SpellingAndGrammar) \
</span><span class="cx"> M(StorageAPI) \
</span><ins>+ M(TextAutosizing) \
</ins><span class="cx"> M(Threading) \
</span><span class="cx"> M(WebAudio) \
</span><span class="cx"> M(WebGL) \
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "HitTestLocation.h"
</span><span class="cx"> #include "InlineTextBox.h"
</span><span class="cx"> #include "LayoutRepainter.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "RenderCombineText.h"
</span><span class="cx"> #include "RenderFlowThread.h"
</span><span class="cx"> #include "RenderInline.h"
</span><span class="lines">@@ -3761,6 +3762,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::adjustComputedFontSizes(float size, float visibleWidth)
</span><span class="cx"> {
</span><ins>+ LOG(TextAutosizing, "RenderBlockFlow %p adjustComputedFontSizes, size=%f visibleWidth=%f, width()=%f. Bailing: %d", this, size, visibleWidth, width().toFloat(), visibleWidth >= width());
+
</ins><span class="cx"> // Don't do any work if the block is smaller than the visible area.
</span><span class="cx"> if (visibleWidth >= width())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -2167,6 +2167,79 @@
</span><span class="cx"> downcast<RenderBoxModelObject>(*this).continuation()->updateOutlineAutoAncestor(hasOutlineAuto);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject* renderer)
+{
+ const RenderStyle& style = renderer->style();
+ if (style.height().type() == Fixed) {
+ if (is<RenderBlock>(*renderer)) {
+ // For fixed height styles, if the overflow size of the element spills out of the specified
+ // height, assume we can apply text auto-sizing.
+ if (style.overflowY() == OVISIBLE
+ && style.height().value() < downcast<RenderBlock>(renderer)->layoutOverflowRect().maxY())
+ return RenderObject::OverflowHeight;
+ }
+ return RenderObject::FixedHeight;
+ }
+ return RenderObject::FlexibleHeight;
+}
+
+void RenderElement::adjustComputedFontSizesOnBlocks(float size, float visibleWidth)
+{
+ Document* document = view().frameView().frame().document();
+ if (!document)
+ return;
+
+ Vector<int> depthStack;
+ int currentDepth = 0;
+ int newFixedDepth = 0;
+
+ // We don't apply autosizing to nodes with fixed height normally.
+ // But we apply it to nodes which are located deep enough
+ // (nesting depth is greater than some const) inside of a parent block
+ // which has fixed height but its content overflows intentionally.
+ for (RenderObject* descendent = traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth); descendent; descendent = descendent->traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth)) {
+ while (depthStack.size() > 0 && currentDepth <= depthStack[depthStack.size() - 1])
+ depthStack.remove(depthStack.size() - 1);
+ if (newFixedDepth)
+ depthStack.append(newFixedDepth);
+
+ int stackSize = depthStack.size();
+ if (is<RenderBlockFlow>(*descendent) && !descendent->isListItem() && (!stackSize || currentDepth - depthStack[stackSize - 1] > TextAutoSizingFixedHeightDepth))
+ downcast<RenderBlockFlow>(*descendent).adjustComputedFontSizes(size, visibleWidth);
+ newFixedDepth = 0;
+ }
+
+ // Remove style from auto-sizing table that are no longer valid.
+ document->validateAutoSizingNodes();
+}
+
+void RenderElement::resetTextAutosizing()
+{
+ Document* document = view().frameView().frame().document();
+ if (!document)
+ return;
+
+ document->resetAutoSizingNodes();
+
+ Vector<int> depthStack;
+ int currentDepth = 0;
+ int newFixedDepth = 0;
+
+ for (RenderObject* descendent = traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth); descendent; descendent = descendent->traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth)) {
+ while (depthStack.size() > 0 && currentDepth <= depthStack[depthStack.size() - 1])
+ depthStack.remove(depthStack.size() - 1);
+ if (newFixedDepth)
+ depthStack.append(newFixedDepth);
+
+ int stackSize = depthStack.size();
+ if (is<RenderBlockFlow>(*descendent) && !descendent->isListItem() && (!stackSize || currentDepth - depthStack[stackSize - 1] > TextAutoSizingFixedHeightDepth))
+ downcast<RenderBlockFlow>(*descendent).resetComputedFontSize();
+ newFixedDepth = 0;
+ }
+}
+#endif // ENABLE(IOS_TEXT_AUTOSIZING)
+
</ins><span class="cx"> RenderBlock* containingBlockForFixedPosition(const RenderElement* element)
</span><span class="cx"> {
</span><span class="cx"> const auto* object = element;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -215,6 +215,11 @@
</span><span class="cx"> bool childRequiresTable(const RenderObject& child) const;
</span><span class="cx"> bool hasContinuation() const { return m_hasContinuation; }
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ void adjustComputedFontSizesOnBlocks(float size, float visibleWidth);
+ WEBCORE_EXPORT void resetTextAutosizing();
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> enum BaseTypeFlag {
</span><span class="cx"> RenderLayerModelObjectFlag = 1 << 0,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -404,78 +404,6 @@
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
-static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject* renderer)
-{
- const RenderStyle& style = renderer->style();
- if (style.height().type() == Fixed) {
- if (is<RenderBlock>(*renderer)) {
- // For fixed height styles, if the overflow size of the element spills out of the specified
- // height, assume we can apply text auto-sizing.
- if (style.overflowY() == OVISIBLE
- && style.height().value() < downcast<RenderBlock>(renderer)->layoutOverflowRect().maxY())
- return RenderObject::OverflowHeight;
- }
- return RenderObject::FixedHeight;
- }
- return RenderObject::FlexibleHeight;
-}
-
-
-void RenderObject::adjustComputedFontSizesOnBlocks(float size, float visibleWidth)
-{
- Document* document = view().frameView().frame().document();
- if (!document)
- return;
-
- Vector<int> depthStack;
- int currentDepth = 0;
- int newFixedDepth = 0;
-
- // We don't apply autosizing to nodes with fixed height normally.
- // But we apply it to nodes which are located deep enough
- // (nesting depth is greater than some const) inside of a parent block
- // which has fixed height but its content overflows intentionally.
- for (RenderObject* descendent = traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth); descendent; descendent = descendent->traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth)) {
- while (depthStack.size() > 0 && currentDepth <= depthStack[depthStack.size() - 1])
- depthStack.remove(depthStack.size() - 1);
- if (newFixedDepth)
- depthStack.append(newFixedDepth);
-
- int stackSize = depthStack.size();
- if (is<RenderBlockFlow>(*descendent) && !descendent->isListItem() && (!stackSize || currentDepth - depthStack[stackSize - 1] > TextAutoSizingFixedHeightDepth))
- downcast<RenderBlockFlow>(*descendent).adjustComputedFontSizes(size, visibleWidth);
- newFixedDepth = 0;
- }
-
- // Remove style from auto-sizing table that are no longer valid.
- document->validateAutoSizingNodes();
-}
-
-void RenderObject::resetTextAutosizing()
-{
- Document* document = view().frameView().frame().document();
- if (!document)
- return;
-
- document->resetAutoSizingNodes();
-
- Vector<int> depthStack;
- int currentDepth = 0;
- int newFixedDepth = 0;
-
- for (RenderObject* descendent = traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth); descendent; descendent = descendent->traverseNext(this, includeNonFixedHeight, currentDepth, newFixedDepth)) {
- while (depthStack.size() > 0 && currentDepth <= depthStack[depthStack.size() - 1])
- depthStack.remove(depthStack.size() - 1);
- if (newFixedDepth)
- depthStack.append(newFixedDepth);
-
- int stackSize = depthStack.size();
- if (is<RenderBlockFlow>(*descendent) && !descendent->isListItem() && (!stackSize || currentDepth - depthStack[stackSize - 1] > TextAutoSizingFixedHeightDepth))
- downcast<RenderBlockFlow>(*descendent).resetComputedFontSize();
- newFixedDepth = 0;
- }
-}
</del><span class="cx"> #endif // ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderObject::enclosingLayer() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -195,9 +195,6 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* traverseNext(const RenderObject* stayWithin, TraverseNextInclusionFunction) const;
</span><span class="cx"> RenderObject* traverseNext(const RenderObject* stayWithin, HeightTypeTraverseNextInclusionFunction, int& currentDepth, int& newFixedDepth) const;
</span><del>-
- void adjustComputedFontSizesOnBlocks(float size, float visibleWidth);
- WEBCORE_EXPORT void resetTextAutosizing();
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RenderLayer* enclosingLayer() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutoSizingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutoSizing.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "RenderListMarker.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="lines">@@ -116,7 +117,9 @@
</span><span class="cx"> averageSize = roundf(specifiedSize * MAX_SCALE_INCREASE);
</span><span class="cx"> scaleChange = averageSize / specifiedSize;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ LOG(TextAutosizing, " adjust node size %p firstPass=%d averageSize=%f scaleChange=%f", autoSizingNode.get(), firstPass, averageSize, scaleChange);
+
</ins><span class="cx"> auto style = cloneRenderStyleWithState(text->style());
</span><span class="cx"> auto fontDescription = style.fontDescription();
</span><span class="cx"> fontDescription.setComputedSize(averageSize);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -67,9 +67,11 @@
</span><span class="cx">
</span><span class="cx"> InternalSettings::Backup::Backup(Settings& settings)
</span><span class="cx"> : m_originalEditingBehavior(settings.editingBehaviorType())
</span><del>-#if ENABLE(TEXT_AUTOSIZING)
</del><ins>+#if ENABLE(TEXT_AUTOSIZING) || ENABLE(IOS_TEXT_AUTOSIZING)
</ins><span class="cx"> , m_originalTextAutosizingEnabled(settings.textAutosizingEnabled())
</span><span class="cx"> , m_originalTextAutosizingWindowSizeOverride(settings.textAutosizingWindowSizeOverride())
</span><ins>+#endif
+#if ENABLE(TEXT_AUTOSIZING)
</ins><span class="cx"> , m_originalTextAutosizingFontScaleFactor(settings.textAutosizingFontScaleFactor())
</span><span class="cx"> #endif
</span><span class="cx"> , m_originalMediaTypeOverride(settings.mediaTypeOverride())
</span><span class="lines">@@ -142,9 +144,11 @@
</span><span class="cx"> settings.setPictographFontFamily(pictographFont.value, static_cast<UScriptCode>(pictographFont.key));
</span><span class="cx"> m_pictographFontFamilies.clear();
</span><span class="cx">
</span><del>-#if ENABLE(TEXT_AUTOSIZING)
</del><ins>+#if ENABLE(TEXT_AUTOSIZING) || ENABLE(IOS_TEXT_AUTOSIZING)
</ins><span class="cx"> settings.setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
</span><span class="cx"> settings.setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindowSizeOverride);
</span><ins>+#endif
+#if ENABLE(TEXT_AUTOSIZING)
</ins><span class="cx"> settings.setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScaleFactor);
</span><span class="cx"> #endif
</span><span class="cx"> settings.setMediaTypeOverride(m_originalMediaTypeOverride);
</span><span class="lines">@@ -325,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> void InternalSettings::setTextAutosizingEnabled(bool enabled, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>-#if ENABLE(TEXT_AUTOSIZING)
</del><ins>+#if ENABLE(TEXT_AUTOSIZING) || ENABLE(IOS_TEXT_AUTOSIZING)
</ins><span class="cx"> InternalSettingsGuardForSettings();
</span><span class="cx"> settings()->setTextAutosizingEnabled(enabled);
</span><span class="cx"> #else
</span><span class="lines">@@ -336,7 +340,7 @@
</span><span class="cx">
</span><span class="cx"> void InternalSettings::setTextAutosizingWindowSizeOverride(int width, int height, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>-#if ENABLE(TEXT_AUTOSIZING)
</del><ins>+#if ENABLE(TEXT_AUTOSIZING) || ENABLE(IOS_TEXT_AUTOSIZING)
</ins><span class="cx"> InternalSettingsGuardForSettings();
</span><span class="cx"> settings()->setTextAutosizingWindowSizeOverride(IntSize(width, height));
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -64,11 +64,15 @@
</span><span class="cx"> ScriptFontFamilyMap m_fantasyFontFamilies;
</span><span class="cx"> ScriptFontFamilyMap m_pictographFontFamilies;
</span><span class="cx">
</span><del>-#if ENABLE(TEXT_AUTOSIZING)
</del><ins>+#if ENABLE(TEXT_AUTOSIZING) || ENABLE(IOS_TEXT_AUTOSIZING)
</ins><span class="cx"> bool m_originalTextAutosizingEnabled;
</span><span class="cx"> IntSize m_originalTextAutosizingWindowSizeOverride;
</span><ins>+#endif
+
+#if ENABLE(TEXT_AUTOSIZING)
</ins><span class="cx"> float m_originalTextAutosizingFontScaleFactor;
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> String m_originalMediaTypeOverride;
</span><span class="cx"> bool m_originalCanvasUsesAcceleratedDrawing;
</span><span class="cx"> bool m_originalMockScrollbarsEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/ios/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
+
+ Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
+ preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
+ These two settings are shared with TEXT_AUTOSIZING.
+
+ Add a TextAutosizing log channel, which is useful for generated -expected.html results.
+
+ Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
+ without changes.
+
+ An implication of this set of changes is that the way clients enable text autosizing
+ has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
+ Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
+ on iPhone only, not iPad.
+
+ Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
+ instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
+
+ UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
+ which will now always return 15, but had no other code that toggled this. So it's safe to just rely
+ on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
+
+ * Misc/WebUIKitSupport.mm:
+ (WebKitGetMinimumZoomFontSize):
+
</ins><span class="cx"> 2016-03-16 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> URL Parsing should signal failure for illegal IDN
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebUIKitSupportmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> float WebKitGetMinimumZoomFontSize(void)
</span><span class="cx"> {
</span><del>- return Settings::defaultMinimumZoomFontSize();
</del><ins>+ return WebCore::Settings::defaultMinimumZoomFontSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int WebKitGetLastLineBreakInBuffer(UChar *characters, int position, int length)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
+
+ Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
+ preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
+ These two settings are shared with TEXT_AUTOSIZING.
+
+ Add a TextAutosizing log channel, which is useful for generated -expected.html results.
+
+ Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
+ without changes.
+
+ An implication of this set of changes is that the way clients enable text autosizing
+ has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
+ Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
+ on iPhone only, not iPad.
+
+ Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
+ instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
+
+ UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
+ which will now always return 15, but had no other code that toggled this. So it's safe to just rely
+ on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences _setTextAutosizingEnabled:]):
+ (-[WebPreferences _textAutosizingEnabled]):
+ * WebView/WebPreferencesPrivate.h:
+
</ins><span class="cx"> 2016-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Regions, Shapes and Tracks don't need runtime features
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx">
</span><del>-ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
</del><ins>+ENABLE_IOS_TEXT_AUTOSIZING = ENABLE_IOS_TEXT_AUTOSIZING;
</ins><span class="cx"> ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
</span><span class="cx">
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -184,6 +184,7 @@
</span><span class="cx"> #define WebKitWantsBalancedSetDefersLoadingBehaviorKey @"WebKitWantsBalancedSetDefersLoadingBehavior"
</span><span class="cx"> #define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
</span><span class="cx"> #define WebKitMinimumZoomFontSizePreferenceKey @"WebKitMinimumZoomFontSizePreferenceKey"
</span><ins>+#define WebKitTextAutosizingEnabledPreferenceKey @"WebKitTextAutosizingEnabled"
</ins><span class="cx"> #define WebKitHTTPEquivEnabledPreferenceKey @"WebKitHTTPEquivEnabled"
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -579,6 +579,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> [NSNumber numberWithFloat:Settings::defaultMinimumZoomFontSize()], WebKitMinimumZoomFontSizePreferenceKey,
</span><ins>+ [NSNumber numberWithBool:Settings::defaultTextAutosizingEnabled()], WebKitTextAutosizingEnabledPreferenceKey,
</ins><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
</span><span class="cx"> [NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
</span><span class="lines">@@ -1475,6 +1476,16 @@
</span><span class="cx"> {
</span><span class="cx"> return [self _floatValueForKey:WebKitMinimumZoomFontSizePreferenceKey];
</span><span class="cx"> }
</span><ins>+
+- (void)_setTextAutosizingEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitTextAutosizingEnabledPreferenceKey];
+}
+
+- (BOOL)_textAutosizingEnabled
+{
+ return [self _boolValueForKey:WebKitTextAutosizingEnabledPreferenceKey];
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -314,6 +314,9 @@
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsAirPlay;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+- (void)_setTextAutosizingEnabled:(BOOL)enabled;
+- (BOOL)_textAutosizingEnabled;
+
</ins><span class="cx"> - (BOOL)isInheritURIQueryComponentEnabled;
</span><span class="cx"> - (void)setEnableInheritURIQueryComponent:(BOOL)flag;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
+
+ Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
+ preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
+ These two settings are shared with TEXT_AUTOSIZING.
+
+ Add a TextAutosizing log channel, which is useful for generated -expected.html results.
+
+ Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
+ without changes.
+
+ An implication of this set of changes is that the way clients enable text autosizing
+ has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
+ Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
+ on iPhone only, not iPad.
+
+ Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
+ instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
+
+ UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
+ which will now always return 15, but had no other code that toggled this. So it's safe to just rely
+ on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _textAutosizingEnabled]):
+ (-[WKPreferences _setTextAutosizingEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2016-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Regions, Shapes and Tracks don't need runtime features
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx">
</span><del>-ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
</del><ins>+ENABLE_IOS_TEXT_AUTOSIZING = ENABLE_IOS_TEXT_AUTOSIZING;
</ins><span class="cx"> ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
</span><span class="cx">
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> #define DEFAULT_TEXT_AREAS_ARE_RESIZABLE false
</span><span class="cx"> #define DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY false
</span><span class="cx"> #define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION true
</span><del>-#define DEFAULT_MINIMUM_FONT_ZOOM_SIZE WebCore::Settings::defaultMinimumZoomFontSize()
</del><span class="cx"> #define DEFAULT_PASSWORD_ECHO_ENABLED true
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
</span><span class="cx"> #define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE true
</span><span class="lines">@@ -85,7 +84,6 @@
</span><span class="cx"> #define DEFAULT_TEXT_AREAS_ARE_RESIZABLE true
</span><span class="cx"> #define DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY true
</span><span class="cx"> #define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION false
</span><del>-#define DEFAULT_MINIMUM_FONT_ZOOM_SIZE 0
</del><span class="cx"> #define DEFAULT_PASSWORD_ECHO_ENABLED false
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
</span><span class="cx"> #define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE false
</span><span class="lines">@@ -194,7 +192,7 @@
</span><span class="cx"> macro(PrimaryPlugInSnapshotDetectionEnabled, primaryPlugInSnapshotDetectionEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(PDFPluginEnabled, pdfPluginEnabled, Bool, bool, DEFAULT_PDFPLUGIN_ENABLED, "", "") \
</span><span class="cx"> macro(UsesEncodingDetector, usesEncodingDetector, Bool, bool, false, "", "") \
</span><del>- macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, false, "", "") \
</del><ins>+ macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, WebCore::Settings::defaultTextAutosizingEnabled(), "", "") \
</ins><span class="cx"> macro(AggressiveTileRetentionEnabled, aggressiveTileRetentionEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(TemporaryTileCohortRetentionEnabled, temporaryTileCohortRetentionEnabled, Bool, bool, DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED, "", "") \
</span><span class="cx"> macro(QTKitEnabled, isQTKitEnabled, Bool, bool, WebCore::Settings::isQTKitEnabled(), "", "") \
</span><span class="lines">@@ -240,7 +238,7 @@
</span><span class="cx"> macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5, "", "") \
</span><span class="cx"> macro(MinimumFontSize, minimumFontSize, Double, double, 0, "", "") \
</span><span class="cx"> macro(MinimumLogicalFontSize, minimumLogicalFontSize, Double, double, 9, "", "") \
</span><del>- macro(MinimumZoomFontSize, minimumZoomFontSize, Double, double, DEFAULT_MINIMUM_FONT_ZOOM_SIZE, "", "") \
</del><ins>+ macro(MinimumZoomFontSize, minimumZoomFontSize, Double, double, WebCore::Settings::defaultMinimumZoomFontSize(), "", "") \
</ins><span class="cx"> macro(DefaultFontSize, defaultFontSize, Double, double, 16, "", "") \
</span><span class="cx"> macro(DefaultFixedFontSize, defaultFixedFontSize, Double, double, 13, "", "") \
</span><span class="cx"> macro(LayoutInterval, layoutInterval, Double, double, -1, "", "") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -303,6 +303,16 @@
</span><span class="cx"> _preferences->setDisplayListDrawingEnabled(displayListDrawingEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_textAutosizingEnabled
+{
+ return _preferences->textAutosizingEnabled();
+}
+
+- (void)_setTextAutosizingEnabled:(BOOL)enabled
+{
+ _preferences->setTextAutosizingEnabled(enabled);
+}
+
</ins><span class="cx"> - (BOOL)_developerExtrasEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->developerExtrasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_AVAILABLE(10_11, 9_0);
</span><span class="cx"> @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx"> @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><ins>+@property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_AVAILABLE(10_11, 9_0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -2968,10 +2968,6 @@
</span><span class="cx"> settings.setAVKitEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- settings.setMinimumZoomFontSize(store.getDoubleValueForKey(WebPreferencesKey::minimumZoomFontSizeKey()));
-#endif
-
</del><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> settings.setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
</span><span class="cx"> #endif
</span><span class="lines">@@ -3022,9 +3018,12 @@
</span><span class="cx"> settings.setPrimaryPlugInSnapshotDetectionEnabled(store.getBoolValueForKey(WebPreferencesKey::primaryPlugInSnapshotDetectionEnabledKey()));
</span><span class="cx"> settings.setUsesEncodingDetector(store.getBoolValueForKey(WebPreferencesKey::usesEncodingDetectorKey()));
</span><span class="cx">
</span><del>-#if ENABLE(TEXT_AUTOSIZING)
</del><ins>+#if ENABLE(TEXT_AUTOSIZING) || ENABLE(IOS_TEXT_AUTOSIZING)
</ins><span class="cx"> settings.setTextAutosizingEnabled(store.getBoolValueForKey(WebPreferencesKey::textAutosizingEnabledKey()));
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ settings.setMinimumZoomFontSize(store.getDoubleValueForKey(WebPreferencesKey::minimumZoomFontSizeKey()));
+#endif
</ins><span class="cx">
</span><span class="cx"> settings.setLogsPageMessagesToSystemConsoleEnabled(store.getBoolValueForKey(WebPreferencesKey::logsPageMessagesToSystemConsoleEnabledKey()));
</span><span class="cx"> settings.setAsynchronousSpellCheckingEnabled(store.getBoolValueForKey(WebPreferencesKey::asynchronousSpellCheckingEnabledKey()));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Tools/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-05-06 Simon Fraser <simon.fraser@apple.com>
+
+ Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
+ https://bugs.webkit.org/show_bug.cgi?id=157432
+ rdar://problem/16406720
+
+ Reviewed by Dean Jackson.
+
+ Enable IOS_TEXT_AUTOSIZING on Mac so it can be tested.
+
+ Make the setTextAutosizingEnabled() Setting work, and plumb it through WK1 and WK2
+ preferences for WTR and DRT. Make textAutosizingWindowSizeOverride() work, for layout tests.
+ These two settings are shared with TEXT_AUTOSIZING.
+
+ Add a TextAutosizing log channel, which is useful for generated -expected.html results.
+
+ Move adjustComputedFontSizesOnBlocks() and related code from RenderObject to RenderElement
+ without changes.
+
+ An implication of this set of changes is that the way clients enable text autosizing
+ has changed. Previously, they set the "MinimumZoomFontSize" preference to 0.
+ Settings::defaultMinimumZoomFontSize() used to do this in order to enable text autosizing
+ on iPhone only, not iPad.
+
+ Now the preferred technique is to leave minimumZoomFontSize alone, and to use textAutosizingEnabled()
+ instead. Settings::defaultTextAutosizingEnabled() now does the check for iPhone.
+
+ UIWebView calls WebKitGetMinimumZoomFontSize() to setup the default minimum font zoom size,
+ which will now always return 15, but had no other code that toggled this. So it's safe to just rely
+ on Settings::defaultTextAutosizingEnabled() doing the right thing for iPhone/iPad.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::setTextAutosizingEnabled):
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformResetPreferencesToConsistentValues):
+
</ins><span class="cx"> 2016-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Regions, Shapes and Tracks don't need runtime features
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -954,8 +954,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><del>- // Disable text autosizing by default.
- [preferences _setMinimumZoomFontSize:0];
</del><ins>+ [preferences _setTextAutosizingEnabled:NO];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // The back/forward cache is causing problems due to layouts during transition from one page to another.
</span><span class="lines">@@ -976,11 +975,6 @@
</span><span class="cx"> [preferences setWebAudioEnabled:YES];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- // Disable text autosizing by default.
- [preferences _setMinimumZoomFontSize:0];
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> [preferences setMediaSourceEnabled:YES];
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -539,8 +539,7 @@
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> void TestRunner::setTextAutosizingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- const float phoneMinimumZoomFontSize = 15;
- [[[mainFrame webView] preferences] _setMinimumZoomFontSize:(enabled ? phoneMinimumZoomFontSize : 0)];
</del><ins>+ [[[mainFrame webView] preferences] _setTextAutosizingEnabled:enabled];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx">
</span><del>-ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
</del><ins>+ENABLE_IOS_TEXT_AUTOSIZING = ENABLE_IOS_TEXT_AUTOSIZING;
</ins><span class="cx"> ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
</span><span class="cx">
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (200533 => 200534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-05-06 23:32:28 UTC (rev 200533)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-05-07 00:05:58 UTC (rev 200534)
</span><span class="lines">@@ -77,8 +77,7 @@
</span><span class="cx"> void TestController::platformResetPreferencesToConsistentValues()
</span><span class="cx"> {
</span><span class="cx"> WKPreferencesRef preferences = platformPreferences();
</span><del>- // Note that WKPreferencesSetTextAutosizingEnabled has no effect on iOS.
- WKPreferencesSetMinimumZoomFontSize(preferences, 0);
</del><ins>+ WKPreferencesSetTextAutosizingEnabled(preferences, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::platformResetStateToConsistentValues()
</span></span></pre>
</div>
</div>
</body>
</html>