Changeset 209516 in webkit


Ignore:
Timestamp:
Dec 7, 2016 7:26:10 PM (7 years ago)
Author:
mark.lam@apple.com
Message:

DumpRenderTree should stop using CheckedMalloc.
​https://bugs.webkit.org/show_bug.cgi?id=165563
<rdar://problem/28945820>

Reviewed by Geoffrey Garen.

  1. WebKitTestRunner does not have equivalent behavior to that which is implemented in CheckedMalloc.
  2. bmalloc does not honor the settings of CheckedMalloc.

The only time CheckedMalloc comes into play is when DRT uses gmalloc or system
malloc. As a result, DRT exhibits different behavior from the normal way we run
our tests. We should obsolete CheckedMalloc and make DRT behave consistently
with WKTR.

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
  • DumpRenderTree/mac/CheckedMalloc.cpp: Removed.
  • DumpRenderTree/mac/CheckedMalloc.h: Removed.
  • DumpRenderTree/mac/DumpRenderTree.mm:

(prepareConsistentTestingEnvironment):

Location:
trunk/Tools
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r209514 r209516  
     12016-12-07  Mark Lam  <mark.lam@apple.com>
     2
     3        DumpRenderTree should stop using CheckedMalloc.
     4        https://bugs.webkit.org/show_bug.cgi?id=165563
     5        <rdar://problem/28945820>
     6
     7        Reviewed by Geoffrey Garen.
     8
     9        1. WebKitTestRunner does not have equivalent behavior to that which is implemented
     10           in CheckedMalloc.
     11        2. bmalloc does not honor the settings of CheckedMalloc.
     12
     13        The only time CheckedMalloc comes into play is when DRT uses gmalloc or system
     14        malloc.  As a result, DRT exhibits different behavior from the normal way we run
     15        our tests.  We should obsolete CheckedMalloc and make DRT behave consistently
     16        with WKTR.
     17
     18        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
     19        * DumpRenderTree/mac/CheckedMalloc.cpp: Removed.
     20        * DumpRenderTree/mac/CheckedMalloc.h: Removed.
     21        * DumpRenderTree/mac/DumpRenderTree.mm:
     22        (prepareConsistentTestingEnvironment):
     23
    1242016-12-07  Dean Jackson  <dino@apple.com>
    225

  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r208983 r209516  
    113113                A8B91ADA0CF3B32F008F91FF /* DumpRenderTreePasteboard.m in Sources */ = {isa = PBXBuildFile; fileRef = A8B91AD70CF3B32F008F91FF /* DumpRenderTreePasteboard.m */; };
    114114                A8B91ADC0CF3B32F008F91FF /* DumpRenderTreeWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8B91AD90CF3B32F008F91FF /* DumpRenderTreeWindow.mm */; };
    115                 A8B91BFD0CF522B4008F91FF /* CheckedMalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8B91BF70CF522B4008F91FF /* CheckedMalloc.cpp */; };
    116115                A8D79CEB0FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A8D79CE90FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.m */; };
    117116                A9BB7C5C1C505278002C525B /* AccessibilityTextMarkerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BB7C5B1C505278002C525B /* AccessibilityTextMarkerIOS.mm */; };
    … …  
    351350                A8B91ADD0CF3B372008F91FF /* DumpRenderTreeWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DumpRenderTreeWindow.h; path = mac/DumpRenderTreeWindow.h; sourceTree = "<group>"; };
    352351                A8B91ADF0CF3B372008F91FF /* DumpRenderTreePasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DumpRenderTreePasteboard.h; path = mac/DumpRenderTreePasteboard.h; sourceTree = "<group>"; };
    353                 A8B91BF70CF522B4008F91FF /* CheckedMalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CheckedMalloc.cpp; path = mac/CheckedMalloc.cpp; sourceTree = "<group>"; };
    354                 A8B91BF90CF522B4008F91FF /* CheckedMalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CheckedMalloc.h; path = mac/CheckedMalloc.h; sourceTree = "<group>"; };
    355352                A8D79CE80FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpRenderTreeFileDraggingSource.h; sourceTree = "<group>"; };
    356353                A8D79CE90FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DumpRenderTreeFileDraggingSource.m; sourceTree = "<group>"; };
    … …  
    491488                                BCA18C460C9B5B9400114369 /* DumpRenderTree.mm */,
    492489                                A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */,
    493                                 A8B91BF70CF522B4008F91FF /* CheckedMalloc.cpp */,
    494                                 A8B91BF90CF522B4008F91FF /* CheckedMalloc.h */,
    495490                                7CBBC3211DDFCF9A00786B9D /* TestOptions.mm */,
    496491                                7CBBC3221DDFCF9A00786B9D /* TestOptions.h */,
    … …  
    11121107                                BC0E26150E2DA4C6001B6BC2 /* AccessibilityUIElementMac.mm in Sources */,
    11131108                                BCA18B390C9B021900114369 /* AppleScriptController.m in Sources */,
    1114                                 A8B91BFD0CF522B4008F91FF /* CheckedMalloc.cpp in Sources */,
    11151109                                53CBB832134E42F3001CE6A4 /* CyclicRedundancyCheck.cpp in Sources */,
    11161110                                1A2FB84F178C80930059FD96 /* DefaultPolicyDelegate.m in Sources */,

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r209514 r209516  
    3232
    3333#import "AccessibilityController.h"
    34 #import "CheckedMalloc.h"
    3534#import "DefaultPolicyDelegate.h"
    3635#import "DumpRenderTreeDraggingInfo.h"
    … …  
    12481247    allocateGlobalControllers();
    12491248   
    1250     makeLargeMallocFailSilently();
    1251 
    12521249#if PLATFORM(MAC)
    12531250    NSActivityOptions options = (NSActivityUserInitiatedAllowingIdleSystemSleep | NSActivityLatencyCritical) & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
Note: See TracChangeset for help on using the changeset viewer.