summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 17:41:02 +0000
committerjeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 17:41:02 +0000
commit64e95e1c7b3e5d946a82002f6fed8f6ada4222e7 (patch)
treefeee8c35366e5889aeb4965bc17de9153356f0d9 /webkit
parentd44583b743d1e556bad4907c05ebd5cc6518b63d (diff)
downloadchromium_src-64e95e1c7b3e5d946a82002f6fed8f6ada4222e7.zip
chromium_src-64e95e1c7b3e5d946a82002f6fed8f6ada4222e7.tar.gz
chromium_src-64e95e1c7b3e5d946a82002f6fed8f6ada4222e7.tar.bz2
Remove Purify and Quantify.Doing so will reduce substantially the size of the project files.
BUG=92102 Review URL: http://codereview.chromium.org/7528010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/extensions/v8/profiler_extension.cc24
-rw-r--r--webkit/tools/test_shell/run_all_tests.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm1
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc7
-rw-r--r--webkit/tools/test_shell/test_shell_platform_delegate.h4
-rw-r--r--webkit/tools/test_shell/test_shell_switches.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_switches.h1
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc5
8 files changed, 3 insertions, 45 deletions
diff --git a/webkit/extensions/v8/profiler_extension.cc b/webkit/extensions/v8/profiler_extension.cc
index 8683353..96bd542 100644
--- a/webkit/extensions/v8/profiler_extension.cc
+++ b/webkit/extensions/v8/profiler_extension.cc
@@ -6,13 +6,6 @@
#include "build/build_config.h"
-#if defined(QUANTIFY)
-// this #define is used to prevent people from directly using pure.h
-// instead of profiler.h
-#define PURIFY_PRIVATE_INCLUDE
-#include "base/third_party/purify/pure.h"
-#endif // QUANTIFY
-
#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
#include "third_party/tcmalloc/chromium/src/google/profiler.h"
#endif
@@ -69,9 +62,7 @@ class ProfilerWrapper : public v8::Extension {
static v8::Handle<v8::Value> ProfilerStart(
const v8::Arguments& args) {
-#if defined(QUANTIFY)
- QuantifyStartRecordingData();
-#elif defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
::ProfilerStart("chrome-profile");
#endif
return v8::Undefined();
@@ -79,9 +70,7 @@ class ProfilerWrapper : public v8::Extension {
static v8::Handle<v8::Value> ProfilerStop(
const v8::Arguments& args) {
-#if defined(QUANTIFY)
- QuantifyStopRecordingData();
-#elif defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
::ProfilerStop();
#endif
return v8::Undefined();
@@ -89,9 +78,6 @@ class ProfilerWrapper : public v8::Extension {
static v8::Handle<v8::Value> ProfilerClearData(
const v8::Arguments& args) {
-#if defined(QUANTIFY)
- QuantifyClearData();
-#endif
return v8::Undefined();
}
@@ -110,12 +96,6 @@ class ProfilerWrapper : public v8::Extension {
v8::Local<v8::String> inputString = args[0]->ToString();
char nameBuffer[256];
inputString->WriteAscii(nameBuffer, 0, sizeof(nameBuffer)-1);
-#if defined(QUANTIFY)
- // make a copy since the Quantify function takes a char*, not const char*
- char buffer[512];
- base::snprintf(buffer, arraysize(buffer)-1, "%s", name);
- QuantifySetThreadName(buffer);
-#endif
}
return v8::Undefined();
}
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index b2d422e..8486362 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -74,7 +74,7 @@ class TestShellTestSuite : public base::TestSuite {
// Some of the individual tests wind up calling TestShell::WaitTestFinished
// which has a timeout in it. For these tests, we don't care about
// a timeout so just set it to be really large. This is necessary because
- // we hit those timeouts under Purify and Valgrind.
+ // we hit those timeouts under Valgrind.
TestShell::SetFileTestTimeout(10 * 60 * 60 * 1000); // Ten hours.
// Initialize test shell in layout test mode, which will let us load one
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index f8ad17c..24cc83e 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -17,7 +17,6 @@
#include "base/logging.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/memory_debug.h"
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/string16.h"
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 5d2efd2..cc2341e 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -11,7 +11,6 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/i18n/icu_util.h"
-#include "base/memory/memory_debug.h"
#include "base/message_loop.h"
#include "base/metrics/stats_table.h"
#include "base/path_service.h"
@@ -325,12 +324,6 @@ int main(int argc, char* argv[]) {
base::EventRecorder::current()->StartPlayback(script_path);
}
- if (parsed_command_line.HasSwitch(test_shell::kDebugMemoryInUse)) {
- base::MemoryDebug::SetMemoryInUseEnabled(true);
- // Dump all in use memory at startup
- base::MemoryDebug::DumpAllMemoryInUse();
- }
-
webkit_glue::SetJavaScriptFlags(TestShell::GetJSFlagsForLoad(0));
MessageLoop::current()->Run();
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate.h b/webkit/tools/test_shell/test_shell_platform_delegate.h
index 19ffbd7..e2d419a 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate.h
+++ b/webkit/tools/test_shell/test_shell_platform_delegate.h
@@ -17,10 +17,6 @@ class TestShellPlatformDelegate {
TestShellPlatformDelegate(const CommandLine& command_line);
~TestShellPlatformDelegate();
- // EnableMemoryDebugging: turn on platform memory debugging assistance
- // (console messages, heap checking, leak detection, etc.).
- void EnableMemoryDebugging();
-
// CheckLayoutTestSystemDependencies: check for any system dependencies that
// can't be easily overridden from within an application (for example, UI or
// display settings). Returns false if any dependencies are not met.
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index fd88861..087b791 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -58,10 +58,6 @@ const char kDumpStatsTable[] = "stats";
// Use a specified cache directory.
const char kCacheDir[] = "cache-dir";
-// When being run through a memory profiler, trigger memory in use dumps at
-// startup and just prior to shutdown.
-const char kDebugMemoryInUse[] = "debug-memory-in-use";
-
// Enable cookies on the file:// scheme. --layout-tests also enables this.
const char kEnableFileCookies[] = "enable-file-cookies";
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index 884b66625..53408dc 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -25,7 +25,6 @@ extern const char kPlaybackMode[];
extern const char kNoEvents[];
extern const char kDumpStatsTable[];
extern const char kCacheDir[];
-extern const char kDebugMemoryInUse[];
extern const char kEnableFileCookies[];
extern const char kAllowScriptsToCloseWindows[];
extern const char kCheckLayoutTestSystemDeps[];
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 3b3c3b9..fbdd03c 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -13,7 +13,6 @@
#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h"
-#include "base/memory/memory_debug.h"
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/resource_util.h"
@@ -567,10 +566,6 @@ LRESULT CALLBACK TestShell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
RemoveWindowFromList(hwnd);
if (TestShell::windowList()->empty() || shell->is_modal()) {
- // Dump all in use memory just before shutdown if in use memory
- // debugging has been enabled.
- base::MemoryDebug::DumpAllMemoryInUse();
-
MessageLoop::current()->PostTask(FROM_HERE,
new MessageLoop::QuitTask());
}