Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define....

chrome/renderer/render_thread.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_thread.h"
 
 #include <v8.h>
 
 #include <algorithm>
+#include <limits>
 #include <map>
 #include <vector>
 
 #if defined(USE_SYSTEM_SQLITE)
 #include <sqlite3.h>
 #else
 #include "third_party/sqlite/preprocessed/sqlite3.h"
 #endif
 
 #include "base/command_line.h"
@@ skipping 345 matching lines @@
 
 void RenderThread::WidgetHidden() {
   DCHECK(hidden_widget_count_ < widget_count_);
   hidden_widget_count_++;
   if (!is_extension_process() &&
       widget_count_ && hidden_widget_count_ == widget_count_)
     ScheduleIdleHandler(kInitialIdleHandlerDelayS);
 }
 
 void RenderThread::WidgetRestored() {
-  DCHECK(hidden_widget_count_ > 0);
+  DCHECK_GT(hidden_widget_count_, 0);
   hidden_widget_count_--;
   if (!is_extension_process())
     idle_timer_.Stop();
 }
 
 void RenderThread::DoNotSuspendWebKitSharedTimer() {
   do_not_suspend_webkit_shared_timer_ = true;
 }
 
 void RenderThread::DoNotNotifyWebKitOfModalLoop() {
@@ skipping 379 matching lines @@
       !command_line.HasSwitch(switches::kDisableSessionStorage));
 
   WebRuntimeFeatures::enableIndexedDatabase(
       command_line.HasSwitch(switches::kEnableIndexedDatabase));
 
   WebRuntimeFeatures::enableGeolocation(
       command_line.HasSwitch(switches::kEnableGeolocation));
 }
 
 void RenderThread::IdleHandler() {
-#if defined(OS_WIN) && defined(USE_TCMALLOC)
+#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
   MallocExtension::instance()->ReleaseFreeMemory();
 #endif
 
   LOG(INFO) << "RenderThread calling v8 IdleNotification for " << this;
   v8::V8::IdleNotification();
 
   // Schedule next invocation.
   // Dampen the delay using the algorithm:
   //    delay = delay + 1 / (delay + 2)
   // Using floor(delay) has a dampening effect such as:
@@ skipping 53 matching lines @@
   while (sqlite3_release_memory(std::numeric_limits<int>::max()) > 0) {
   }
 
   // Repeatedly call the V8 idle notification until it returns true ("nothing
   // more to free").  Note that it makes more sense to do this than to implement
   // a new "delete everything" pass because object references make it difficult
   // to free everything possible in just one pass.
   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
 }
 
 void RenderThread::OnPurgePluginListCache(bool reload_pages) {
   EnsureWebKitInitialized();
   // The call below will cause a GetPlugins call with refresh=true, but at this
   // point we already know that the browser has refreshed its list, so disable
   // refresh temporarily to prevent each renderer process causing the list to be
@@ skipping 13 matching lines @@
   spellchecker_->EnableAutoSpellCorrect(auto_spell_correct);
 }
 
 void RenderThread::OnSpellCheckWordAdded(const std::string& word) {
   spellchecker_->WordAdded(word);
 }
 
 void RenderThread::OnSpellCheckEnableAutoSpellCorrect(bool enable) {
   spellchecker_->EnableAutoSpellCorrect(enable);
 }