Changeset 99467 in webkit

Timestamp:

Nov 7, 2011 1:14:53 PM (12 years ago)

Author:

mihnea@adobe.com

Message:

Leaks seen in RenderRegion::setRenderBoxRegionInfo on Leaks bot
​https://bugs.webkit.org/show_bug.cgi?id=71259

Reviewed by Darin Adler.

Leak fixes covered by existing tests.

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::logicalWidthChangedInRegions):
The RenderBoxRegionInfo taken out of RenderRegion must be deleted on all code paths.

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::removeRenderBoxRegionInfo):
The RenderBoxRegionInfo map owns the values, therefore, when values are removed from map
they must also be deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (1 diff)
• rendering/RenderRegion.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-07  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        Leaks seen in RenderRegion::setRenderBoxRegionInfo on Leaks bot
+        https://bugs.webkit.org/show_bug.cgi?id=71259
+
+        Reviewed by Darin Adler.
+
+        Leak fixes covered by existing tests.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::logicalWidthChangedInRegions):
+        The RenderBoxRegionInfo taken out of RenderRegion must be deleted on all code paths.
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::removeRenderBoxRegionInfo):
+        The RenderBoxRegionInfo map owns the values, therefore, when values are removed from map
+        they must also be deleted.
+
 2011-11-07  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -659 +659 @@
             continue;
 
+        LayoutUnit oldLogicalWidth = oldInfo->logicalWidth();
+        delete oldInfo;
+
         RenderBoxRegionInfo* newInfo = block->renderBoxRegionInfo(region, offsetFromLogicalTopOfFirstPage);
-        if (!newInfo || newInfo->logicalWidth() != oldInfo->logicalWidth()) {
-            delete oldInfo;
+        if (!newInfo || newInfo->logicalWidth() != oldLogicalWidth)
             return true;
-        }
-        
+
         if (region == endRegion)
             break;
     }
-    
+
     return false;
 }

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -225 +225 @@
 void RenderRegion::removeRenderBoxRegionInfo(const RenderBox* box)
 {
-    m_renderBoxRegionInfo.remove(box);
+    delete m_renderBoxRegionInfo.take(box);
 }