Changeset 178397 in webkit

Timestamp:

Jan 13, 2015 5:34:31 PM (9 years ago)

Author:

Joseph Pecoraro

Message:

NSButtonCell leak allocated under WebCore::paintToggleButton
​https://bugs.webkit.org/show_bug.cgi?id=137014

Reviewed by Alexey Proskuryakov.

• platform/mac/ThemeMac.mm:

(WebCore::createToggleButtonCell):
Immediately adopt the NSButtonCell allocation.

(WebCore::sharedRadioCell):
(WebCore::sharedCheckboxCell):
Move from the RetainPtr into the static variable.

(WebCore::paintToggleButton):
Use RetainPtr logic to better manage lifetimes.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/ThemeMac.mm (modified) (9 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-13  Joseph Pecoraro  <pecoraro@apple.com>
+
+        NSButtonCell leak allocated under WebCore::paintToggleButton
+        https://bugs.webkit.org/show_bug.cgi?id=137014
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/mac/ThemeMac.mm:
+        (WebCore::createToggleButtonCell):
+        Immediately adopt the NSButtonCell allocation.
+
+        (WebCore::sharedRadioCell):
+        (WebCore::sharedCheckboxCell):
+        Move from the RetainPtr into the static variable.
+
+        (WebCore::paintToggleButton):
+        Use RetainPtr logic to better manage lifetimes.
+
 2015-01-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/mac/ThemeMac.mm

@@ -33 +33 @@
 #import "WebCoreSystemInterface.h"
 #import <Carbon/Carbon.h>
-#include <wtf/StdLibExtras.h>
+#import <wtf/StdLibExtras.h>
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
@@ -343 +343 @@
 }
     
-static NSButtonCell *createToggleButtonCell(ControlPart buttonType)
-{
-    NSButtonCell *toggleButtonCell = [[NSButtonCell alloc] init];
+static RetainPtr<NSButtonCell> createToggleButtonCell(ControlPart buttonType)
+{
+    RetainPtr<NSButtonCell> toggleButtonCell = adoptNS([[NSButtonCell alloc] init]);
     
     if (buttonType == CheckboxPart) {
@@ -362 +362 @@
 static NSButtonCell *sharedRadioCell(const ControlStates* states, const IntSize& zoomedSize, float zoomFactor)
 {
-    static NSButtonCell *radioCell;
-    if (!radioCell)
-        radioCell = createToggleButtonCell(RadioPart);
+    static NSButtonCell *radioCell = createToggleButtonCell(RadioPart).leakRef();
 
     configureToggleButton(radioCell, RadioPart, states, zoomedSize, zoomFactor, false);
@@ -372 +370 @@
 static NSButtonCell *sharedCheckboxCell(const ControlStates* states, const IntSize& zoomedSize, float zoomFactor)
 {
-    static NSButtonCell *checkboxCell;
-    if (!checkboxCell)
-        checkboxCell = createToggleButtonCell(CheckboxPart);
+    static NSButtonCell *checkboxCell = createToggleButtonCell(CheckboxPart).leakRef();
 
     configureToggleButton(checkboxCell, CheckboxPart, states, zoomedSize, zoomFactor, false);
@@ -390 +386 @@
     BEGIN_BLOCK_OBJC_EXCEPTIONS
 
-    NSButtonCell *toggleButtonCell = static_cast<NSButtonCell*>(controlStates->platformControl());
+    RetainPtr<NSButtonCell> toggleButtonCell = static_cast<NSButtonCell *>(controlStates->platformControl());
     IntSize zoomedRectSize = IntSize(zoomedRect.size());
 
@@ -396 +392 @@
         if (!toggleButtonCell)
             toggleButtonCell = createToggleButtonCell(buttonType);
-        configureToggleButton(toggleButtonCell, buttonType, controlStates, zoomedRectSize, zoomFactor, true);
+        configureToggleButton(toggleButtonCell.get(), buttonType, controlStates, zoomedRectSize, zoomFactor, true);
     } else {
         if (!toggleButtonCell) {
@@ -406 +402 @@
             }
         }
-        configureToggleButton(toggleButtonCell, buttonType, controlStates, zoomedRectSize, zoomFactor, false);
+        configureToggleButton(toggleButtonCell.get(), buttonType, controlStates, zoomedRectSize, zoomFactor, false);
     }
     controlStates->setDirty(false);
@@ -450 +446 @@
 
     if (!isAnimating && (controlStates->states() & ControlStates::FocusState))
-        needsRepaint = drawCellFocusRing(toggleButtonCell, inflatedRect, view);
+        needsRepaint = drawCellFocusRing(toggleButtonCell.get(), inflatedRect, view);
     [toggleButtonCell setControlView:nil];
 
@@ -458 +454 @@
     controlStates->setNeedsRepaint(needsRepaint);
     if (needsRepaint)
-        controlStates->setPlatformControl(toggleButtonCell);
+        controlStates->setPlatformControl(toggleButtonCell.get());
 
     END_BLOCK_OBJC_EXCEPTIONS