Title: [221004] branches/safari-604-branch/Source/WebCore
- Revision
- 221004
- Author
- [email protected]
- Date
- 2017-08-21 22:54:30 -0700 (Mon, 21 Aug 2017)
Log Message
Cherry-pick r220940. rdar://problem/33994308
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (221003 => 221004)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-08-22 04:57:27 UTC (rev 221003)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-08-22 05:54:30 UTC (rev 221004)
@@ -1,3 +1,19 @@
+2017-08-21 Jason Marcell <[email protected]>
+
+ Cherry-pick r220940. rdar://problem/33994308
+
+ 2017-08-18 Tim Horton <[email protected]>
+
+ Remove classic mode screen scale clamping
+ https://bugs.webkit.org/show_bug.cgi?id=175739
+ <rdar://problem/33894531>
+
+ Reviewed by Andy Estes.
+
+ * platform/ios/PlatformScreenIOS.mm:
+ (WebCore::screenScaleFactor):
+ This code is no longer needed.
+
2017-08-15 Jason Marcell <[email protected]>
Cherry-pick r220723. rdar://problem/33901127
Modified: branches/safari-604-branch/Source/WebCore/platform/ios/PlatformScreenIOS.mm (221003 => 221004)
--- branches/safari-604-branch/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2017-08-22 04:57:27 UTC (rev 221003)
+++ branches/safari-604-branch/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2017-08-22 05:54:30 UTC (rev 221004)
@@ -144,14 +144,7 @@
if (!screen)
screen = [get_UIKit_UIScreenClass() mainScreen];
- CGFloat scale = screen.scale;
-
- // We can remove this clamping once <rdar://problem/16395475> is fixed.
- const CGFloat maximumClassicScreenScaleFactor = 2;
- if ([[get_UIKit_UIApplicationClass() sharedApplication] _isClassic])
- return std::min(scale, maximumClassicScreenScaleFactor);
-
- return scale;
+ return screen.scale;
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
