Title: [194348] branches/safari-601.1.46-branch/Source/WebKit/ios
- Revision
- 194348
- Author
- [email protected]
- Date
- 2015-12-21 14:22:58 -0800 (Mon, 21 Dec 2015)
Log Message
Merged r194307. rdar://problem/23976350
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit/ios/ChangeLog (194347 => 194348)
--- branches/safari-601.1.46-branch/Source/WebKit/ios/ChangeLog 2015-12-21 21:19:58 UTC (rev 194347)
+++ branches/safari-601.1.46-branch/Source/WebKit/ios/ChangeLog 2015-12-21 22:22:58 UTC (rev 194348)
@@ -1,3 +1,23 @@
+2015-12-21 Babak Shafiei <[email protected]>
+
+ Merge r194307.
+
+ 2015-12-18 Simon Fraser <[email protected]>
+
+ Turn off "shrink-to-fit" viewport scaling in UIWebViews
+ https://bugs.webkit.org/show_bug.cgi?id=152451
+ rdar://problem/23960882
+
+ Reviewed by Tim Horton.
+
+ Disable the "shrink to fit" behavior in UIWebViews. This disables it entirely,
+ even when the page has "shrink-to-fit=yes" in the viewport meta tag.
+
+ Not testable because we can't test actual UIWebView scaling behavior.
+
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ (dictionaryForViewportArguments):
+
2015-07-23 Lucas Forschler <[email protected]>
Merge r187113
Modified: branches/safari-601.1.46-branch/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm (194347 => 194348)
--- branches/safari-601.1.46-branch/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2015-12-21 21:19:58 UTC (rev 194347)
+++ branches/safari-601.1.46-branch/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2015-12-21 22:22:58 UTC (rev 194348)
@@ -167,7 +167,7 @@
@"minimum-scale":@(arguments.minZoom),
@"maximum-scale":@(arguments.maxZoom),
@"user-scalable":@(arguments.userZoom),
- @"shrink-to-fit":@(arguments.shrinkToFit),
+ @"shrink-to-fit":@(0),
@"width":@(arguments.width),
@"height":@(arguments.height) };
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
