Title: [236148] trunk/Source/WebCore
Revision
236148
Author
[email protected]
Date
2018-09-18 11:30:02 -0700 (Tue, 18 Sep 2018)

Log Message

[macOS] Frequent leaks seen under WebCore::gpuIDForDisplayMask
https://bugs.webkit.org/show_bug.cgi?id=189685
<rdar://problem/44541974>

Patch by Joseph Pecoraro <[email protected]> on 2018-09-18
Reviewed by Per Arne Vollan.

* platform/mac/PlatformScreenMac.mm:
(WebCore::gpuIDForDisplayMask):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (236147 => 236148)


--- trunk/Source/WebCore/ChangeLog	2018-09-18 18:29:06 UTC (rev 236147)
+++ trunk/Source/WebCore/ChangeLog	2018-09-18 18:30:02 UTC (rev 236148)
@@ -1,3 +1,14 @@
+2018-09-18  Joseph Pecoraro  <[email protected]>
+
+        [macOS] Frequent leaks seen under WebCore::gpuIDForDisplayMask
+        https://bugs.webkit.org/show_bug.cgi?id=189685
+        <rdar://problem/44541974>
+
+        Reviewed by Per Arne Vollan.
+
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::gpuIDForDisplayMask):
+
 2018-09-18  Youenn Fablet  <[email protected]>
 
         Implement RTCRtpReceiver getContributingSources/getSynchronizationSources

Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (236147 => 236148)


--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-09-18 18:29:06 UTC (rev 236147)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-09-18 18:30:02 UTC (rev 236148)
@@ -209,20 +209,27 @@
     // 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to