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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasec Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "content/renderer/media/video_capture_message_filter.h" 50 #include "content/renderer/media/video_capture_message_filter.h"
51 #include "content/renderer/plugin_channel_host.h" 51 #include "content/renderer/plugin_channel_host.h"
52 #include "content/renderer/render_process_impl.h" 52 #include "content/renderer/render_process_impl.h"
53 #include "content/renderer/render_view_impl.h" 53 #include "content/renderer/render_view_impl.h"
54 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 54 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
55 #include "grit/content_resources.h" 55 #include "grit/content_resources.h"
56 #include "ipc/ipc_channel_handle.h" 56 #include "ipc/ipc_channel_handle.h"
57 #include "ipc/ipc_platform_file.h" 57 #include "ipc/ipc_platform_file.h"
58 #include "net/base/net_errors.h" 58 #include "net/base/net_errors.h"
59 #include "net/base/net_util.h" 59 #include "net/base/net_util.h"
60 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" 60 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
61 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h" 61 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
62 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" 62 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
63 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" 63 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
64 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 64 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
65 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 65 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
66 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 66 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
67 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 67 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
68 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" 68 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
69 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 69 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
70 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h " 70 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h "
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 941
942 scoped_refptr<base::MessageLoopProxy> 942 scoped_refptr<base::MessageLoopProxy>
943 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 943 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
944 DCHECK(message_loop() == MessageLoop::current()); 944 DCHECK(message_loop() == MessageLoop::current());
945 if (!file_thread_.get()) { 945 if (!file_thread_.get()) {
946 file_thread_.reset(new base::Thread("Renderer::FILE")); 946 file_thread_.reset(new base::Thread("Renderer::FILE"));
947 file_thread_->Start(); 947 file_thread_->Start();
948 } 948 }
949 return file_thread_->message_loop_proxy(); 949 return file_thread_->message_loop_proxy();
950 } 950 }
OLDNEW
« no previous file with comments | « content/browser/zygote_host_impl_linux.cc ('k') | third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-gcc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698