diff options
| -rw-r--r-- | base/leak_annotations.h | 2 | ||||
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/memory_purger.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | third_party/tcmalloc/chromium/src/config.h | 4 | ||||
| -rw-r--r-- | webkit/DEPS | 1 | ||||
| -rw-r--r-- | webkit/extensions/v8/heap_profiler_extension.cc | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/base/leak_annotations.h b/base/leak_annotations.h index 7e652a5..f3d3677 100644 --- a/base/leak_annotations.h +++ b/base/leak_annotations.h @@ -7,7 +7,7 @@ #if defined(LINUX_USE_TCMALLOC) -#include "third_party/tcmalloc/heap-checker.h" +#include "third_party/tcmalloc/chromium/src/google/heap-checker.h" // Annotate a program scope as having memory leaks. Tcmalloc's heap leak // checker will ignore them. Note that these annotations may mask real bugs diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 79abe28..8ae39e0 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -59,7 +59,7 @@ #endif #if defined(USE_TCMALLOC) -#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" #endif using sync_api::SyncManager; diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index bde8cdb..b66f043 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -19,7 +19,7 @@ #include "chrome/common/render_messages.h" #include "net/proxy/proxy_resolver.h" #include "net/url_request/url_request_context.h" -#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" #include "v8/include/v8.h" // PurgeMemoryHelper ----------------------------------------------------------- diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 3474109..69c8cb2 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -57,7 +57,7 @@ #include "chrome/renderer/user_script_slave.h" #include "ipc/ipc_message.h" #include "ipc/ipc_platform_file.h" -#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" #include "third_party/WebKit/WebKit/chromium/public/WebColor.h" #include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h" diff --git a/third_party/tcmalloc/chromium/src/config.h b/third_party/tcmalloc/chromium/src/config.h index 6155a86..812c67c 100644 --- a/third_party/tcmalloc/chromium/src/config.h +++ b/third_party/tcmalloc/chromium/src/config.h @@ -12,9 +12,9 @@ #define TC_VERSION_STRING "google-perftools 1.4" #if defined(OS_WIN) -#include "third_party/tcmalloc/config_win.h" +#include "third_party/tcmalloc/chromium/src/config_win.h" #elif defined(OS_LINUX) -#include "third_party/tcmalloc/config_linux.h" +#include "third_party/tcmalloc/chromium/src/config_linux.h" #endif #endif // CONFIG_H_ diff --git a/webkit/DEPS b/webkit/DEPS index 5102de3..c199e99 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -8,6 +8,7 @@ include_rules = [ "+bridge", "+grit", # For generated headers "+third_party/sqlite", + "+third_party/tcmalloc", # For databases/ "+app/sql", diff --git a/webkit/extensions/v8/heap_profiler_extension.cc b/webkit/extensions/v8/heap_profiler_extension.cc index 058a5c2..e52c8a6 100644 --- a/webkit/extensions/v8/heap_profiler_extension.cc +++ b/webkit/extensions/v8/heap_profiler_extension.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #if defined(LINUX_USE_TCMALLOC) -#include "third_party/tcmalloc/tcmalloc/src/google/heap-profiler.h" +#include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" #endif namespace extensions_v8 { |