Title: [200817] branches/safari-602.1.32-branch/Source/WebKit/mac
- Revision
- 200817
- Author
- [email protected]
- Date
- 2016-05-12 23:38:13 -0700 (Thu, 12 May 2016)
Log Message
Merged r200664. rdar://problem/26262632
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog (200816 => 200817)
--- branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-13 06:37:09 UTC (rev 200816)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-13 06:38:13 UTC (rev 200817)
@@ -1,3 +1,19 @@
+2016-05-12 Babak Shafiei <[email protected]>
+
+ Merge r200664.
+
+ 2016-05-10 Simon Fraser <[email protected]>
+
+ [iOS WK1] text autosizing was on for all layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=157541
+
+ Reviewed by Tim Horton.
+
+ Make sure that we transfer the WK1 text autosizing preference to Settings.
+
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2016-05-08 Myles C. Maxfield <[email protected]>
[OS X] Migrate our Font classes entirely off of NSFont
Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebView.mm (200816 => 200817)
--- branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebView.mm 2016-05-13 06:37:09 UTC (rev 200816)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebView.mm 2016-05-13 06:38:13 UTC (rev 200817)
@@ -2400,6 +2400,7 @@
#if ENABLE(IOS_TEXT_AUTOSIZING)
settings.setMinimumZoomFontSize([preferences _minimumZoomFontSize]);
+ settings.setTextAutosizingEnabled([preferences _textAutosizingEnabled]);
#endif
#endif // PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
