Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3806)

Unified Diff: chrome/renderer/render_thread.cc

Issue 660118: Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/memory_purger.cc ('k') | webkit/extensions/v8/heap_profiler_extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_thread.cc
===================================================================
--- chrome/renderer/render_thread.cc (revision 39977)
+++ chrome/renderer/render_thread.cc (working copy)
@@ -7,6 +7,7 @@
#include <v8.h>
#include <algorithm>
+#include <limits>
#include <map>
#include <vector>
@@ -372,7 +373,7 @@
}
void RenderThread::WidgetRestored() {
- DCHECK(hidden_widget_count_ > 0);
+ DCHECK_GT(hidden_widget_count_, 0);
hidden_widget_count_--;
if (!is_extension_process())
idle_timer_.Stop();
@@ -772,7 +773,7 @@
}
void RenderThread::IdleHandler() {
-#if defined(OS_WIN) && defined(USE_TCMALLOC)
+#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
MallocExtension::instance()->ReleaseFreeMemory();
#endif
@@ -846,7 +847,7 @@
while (!v8::V8::IdleNotification()) {
}
-#if defined(OS_WIN) && defined(USE_TCMALLOC)
+#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
// Tell tcmalloc to release any free pages it's still holding.
MallocExtension::instance()->ReleaseFreeMemory();
#endif
« no previous file with comments | « chrome/browser/memory_purger.cc ('k') | webkit/extensions/v8/heap_profiler_extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698