Changeset 221004 in webkit

Timestamp:

Aug 21, 2017, 10:54:30 PM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220940. rdar://problem/33994308

Location:

branches/safari-604-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/PlatformScreenIOS.mm (modified) (1 diff)

branches/safari-604-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-21  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220940. rdar://problem/33994308
+
+    2017-08-18  Tim Horton  <timothy_horton@apple.com>
+
+            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  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebCore/platform/ios/PlatformScreenIOS.mm

@@ -145 +145 @@
         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;
 }