Changeset 288489 in webkit

Timestamp:

Jan 24, 2022, 5:02:41 PM (5 years ago)

Author:

pvollan@apple.com

Message:

[iOS] Avoid calling IOSurfaceGetPropertyMaximum
​https://bugs.webkit.org/show_bug.cgi?id=235526
<rdar://85128431>

Reviewed by Simon Fraser and Darin Adler.

There should be no need to call IOSurfaceGetPropertyMaximum on iOS, since the return value will exceed the hardcoded maximum.

• platform/graphics/cocoa/IOSurface.mm:

(WebCore::maxSurfaceDimensionCA):
(WebCore::computeMaximumSurfaceSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/IOSurface.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-24  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] Avoid calling IOSurfaceGetPropertyMaximum
+        https://bugs.webkit.org/show_bug.cgi?id=235526
+        <rdar://85128431>
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        There should be no need to call IOSurfaceGetPropertyMaximum on iOS, since the return value will exceed the hardcoded maximum.
+
+        * platform/graphics/cocoa/IOSurface.mm:
+        (WebCore::maxSurfaceDimensionCA):
+        (WebCore::computeMaximumSurfaceSize):
+
 2022-01-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

@@ -229 +229 @@
 IOSurface::~IOSurface() = default;
 
-static IntSize computeMaximumSurfaceSize()
-{
-    IntSize maxSize(clampToInteger(IOSurfaceGetPropertyMaximum(kIOSurfaceWidth)), clampToInteger(IOSurfaceGetPropertyMaximum(kIOSurfaceHeight)));
-
-    // Protect against maxSize being { 0, 0 }.
-    const int maxSurfaceDimensionLowerBound = 1024;
-
+static constexpr IntSize maxSurfaceDimensionCA()
+{
+    // Match limits imposed by Core Animation. FIXME: should have API for this <rdar://problem/25454148>
 #if PLATFORM(IOS_FAMILY)
-    // Match limits imposed by Core Animation. FIXME: should have API for this <rdar://problem/25454148>
-    const int maxSurfaceDimension = 8 * 1024;
+    constexpr int maxSurfaceDimension = 8 * 1024;
 #else
     // IOSurface::maximumSize() can return { INT_MAX, INT_MAX } when hardware acceleration is unavailable.
-    const int maxSurfaceDimension = 32 * 1024;
-#endif
-
-    return maxSize.constrainedBetween({ maxSurfaceDimensionLowerBound, maxSurfaceDimensionLowerBound }, { maxSurfaceDimension, maxSurfaceDimension });
+    constexpr int maxSurfaceDimension = 32 * 1024;
+#endif
+    return { maxSurfaceDimension, maxSurfaceDimension };
+}
+
+static IntSize computeMaximumSurfaceSize()
+{
+#if PLATFORM(IOS)
+    return maxSurfaceDimensionCA();
+#else
+    IntSize maxSize(clampToInteger(IOSurfaceGetPropertyMaximum(kIOSurfaceWidth)), clampToInteger(IOSurfaceGetPropertyMaximum(kIOSurfaceHeight)));
+
+    // Protect against maxSize being { 0, 0 }.
+    constexpr int maxSurfaceDimensionLowerBound = 1024;
+
+    return maxSize.constrainedBetween({ maxSurfaceDimensionLowerBound, maxSurfaceDimensionLowerBound }, maxSurfaceDimensionCA() );
+#endif
 }