diff options
Diffstat (limited to 'Source/WebKit/mac/Misc')
| -rw-r--r-- | Source/WebKit/mac/Misc/WebCoreStatistics.mm | 11 | ||||
| -rw-r--r-- | Source/WebKit/mac/Misc/WebIconDatabase.mm | 18 |
2 files changed, 6 insertions, 23 deletions
diff --git a/Source/WebKit/mac/Misc/WebCoreStatistics.mm b/Source/WebKit/mac/Misc/WebCoreStatistics.mm index 5d96c95..c3c3687 100644 --- a/Source/WebKit/mac/Misc/WebCoreStatistics.mm +++ b/Source/WebKit/mac/Misc/WebCoreStatistics.mm @@ -86,7 +86,7 @@ using namespace WebCore; NSCountedSet *result = [NSCountedSet set]; - OwnPtr<HashCountedSet<const char*> > counts(JSDOMWindow::commonJSGlobalData()->heap.protectedObjectTypeCounts()); + OwnPtr<TypeCountSet> counts(JSDOMWindow::commonJSGlobalData()->heap.protectedObjectTypeCounts()); HashCountedSet<const char*>::iterator end = counts->end(); for (HashCountedSet<const char*>::iterator it = counts->begin(); it != end; ++it) for (unsigned i = 0; i < it->second; ++i) @@ -101,7 +101,7 @@ using namespace WebCore; NSCountedSet *result = [NSCountedSet set]; - OwnPtr<HashCountedSet<const char*> > counts(JSDOMWindow::commonJSGlobalData()->heap.objectTypeCounts()); + OwnPtr<TypeCountSet> counts(JSDOMWindow::commonJSGlobalData()->heap.objectTypeCounts()); HashCountedSet<const char*>::iterator end = counts->end(); for (HashCountedSet<const char*>::iterator it = counts->begin(); it != end; ++it) for (unsigned i = 0; i < it->second; ++i) @@ -197,15 +197,16 @@ using namespace WebCore; WTF::FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics(); JSLock lock(SilenceAssertionsOnly); - MarkedSpace::Statistics heapMemoryStats = heapStatistics(JSDOMWindow::commonJSGlobalData()); + size_t heapSize = JSDOMWindow::commonJSGlobalData()->heap.size(); + size_t heapFree = JSDOMWindow::commonJSGlobalData()->heap.capacity() - heapSize; GlobalMemoryStatistics globalMemoryStats = globalMemoryStatistics(); return [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt:fastMallocStatistics.reservedVMBytes], @"FastMallocReservedVMBytes", [NSNumber numberWithInt:fastMallocStatistics.committedVMBytes], @"FastMallocCommittedVMBytes", [NSNumber numberWithInt:fastMallocStatistics.freeListBytes], @"FastMallocFreeListBytes", - [NSNumber numberWithInt:heapMemoryStats.size], @"JavaScriptHeapSize", - [NSNumber numberWithInt:heapMemoryStats.free], @"JavaScriptFreeSize", + [NSNumber numberWithInt:heapSize], @"JavaScriptHeapSize", + [NSNumber numberWithInt:heapFree], @"JavaScriptFreeSize", [NSNumber numberWithUnsignedInt:(unsigned int)globalMemoryStats.stackBytes], @"JavaScriptStackSize", [NSNumber numberWithUnsignedInt:(unsigned int)globalMemoryStats.JITBytes], @"JavaScriptJITSize", nil]; diff --git a/Source/WebKit/mac/Misc/WebIconDatabase.mm b/Source/WebKit/mac/Misc/WebIconDatabase.mm index 7d0a350..14ef037 100644 --- a/Source/WebKit/mac/Misc/WebIconDatabase.mm +++ b/Source/WebKit/mac/Misc/WebIconDatabase.mm @@ -590,24 +590,6 @@ bool importToWebCoreFormat() [ThreadEnabler enableThreading]; ASSERT([NSThread isMultiThreaded]); -#ifndef BUILDING_ON_TIGER - // Tell backup software (i.e., Time Machine) to never back up the icon database, because - // it's a large file that changes frequently, thus using a lot of backup disk space, and - // it's unlikely that many users would be upset about it not being backed up. We do this - // here because this code is only executed once for each icon database instance. We could - // make this configurable on a per-client basis someday if that seemed useful. - // See <rdar://problem/5320208>. - // FIXME: This has nothing to do with importing from the old to the new database format and should be moved elsewhere, - // especially because we might eventually delete all of this legacy importing code and we shouldn't delete this. - CFStringRef databasePath = iconDatabase()->databasePath().createCFString(); - if (databasePath) { - CFURLRef databasePathURL = CFURLCreateWithFileSystemPath(0, databasePath, kCFURLPOSIXPathStyle, FALSE); - CFRelease(databasePath); - CSBackupSetItemExcluded(databasePathURL, true, true); - CFRelease(databasePathURL); - } -#endif - // Get the directory the old icon database *should* be in NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *databaseDirectory = [defaults objectForKey:WebIconDatabaseImportDirectoryDefaultsKey]; |