Attachment 349982 Details for Bug 189685 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

leaks-1.patch (text/plain), 1.94 KB, created by Joseph Pecoraro on 2018-09-17 18:03:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2018-09-17 18:03:59 PDT

Size: 1.94 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 715675b0ff3..fb0284a532a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-09-17  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [macOS] Frequent leaks seen under WebCore::gpuIDForDisplayMask
>+        https://bugs.webkit.org/show_bug.cgi?id=189685
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (OOPS!).
>+
>+        * platform/mac/PlatformScreenMac.mm:
>+        (WebCore::gpuIDForDisplayMask):
>+
> 2018-09-17  Jer Noble  <jer.noble@apple.com>
> 
>         Add support for HEVC codec types in Media Capabilities
>diff --git a/Source/WebCore/platform/mac/PlatformScreenMac.mm b/Source/WebCore/platform/mac/PlatformScreenMac.mm
>index 8e72657de1d..0402319023b 100644
>--- a/Source/WebCore/platform/mac/PlatformScreenMac.mm
>+++ b/Source/WebCore/platform/mac/PlatformScreenMac.mm
>@@ -209,20 +209,27 @@ IORegistryGPUID gpuIDForDisplayMask(GLuint displayMask)
>     // The 0th renderer should not be the software renderer.
>     GLint isAccelerated;
>     error = CGLDescribeRenderer(rendererInfo, 0, kCGLRPAccelerated, &isAccelerated);
>-    if (!isAccelerated || error != kCGLNoError)
>+    if (!isAccelerated || error != kCGLNoError) {
>+        CGLDestroyRendererInfo(rendererInfo);
>         return 0;
>+    }
> 
>     GLint gpuIDLow = 0;
>     GLint gpuIDHigh = 0;
> 
>     error = CGLDescribeRenderer(rendererInfo, 0, kCGLRPRegistryIDLow, &gpuIDLow);
>-    if (error != kCGLNoError)
>+    if (error != kCGLNoError) {
>+        CGLDestroyRendererInfo(rendererInfo);
>         return 0;
>+    }
> 
>     error = CGLDescribeRenderer(rendererInfo, 0, kCGLRPRegistryIDHigh, &gpuIDHigh);
>-    if (error != kCGLNoError)
>+    if (error != kCGLNoError) {
>+        CGLDestroyRendererInfo(rendererInfo);
>         return 0;
>+    }
> 
>+    CGLDestroyRendererInfo(rendererInfo);
>     return (IORegistryGPUID) gpuIDHigh << 32 | gpuIDLow;
> }
> #endif // !__MAC_OS_X_VERSION_MIN_REQUIRED >= 101300

Actions: View | Formatted Diff | Diff

Attachments on bug 189685: 349982 | 349990