diff options
-rw-r--r-- | chrome/renderer/chrome_render_process_observer.cc | 5 | ||||
-rw-r--r-- | content/public/renderer/render_thread.h | 2 | ||||
-rw-r--r-- | content/public/test/mock_render_thread.cc | 2 | ||||
-rw-r--r-- | content/public/test/mock_render_thread.h | 2 | ||||
-rw-r--r-- | content/renderer/render_thread_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/render_thread_impl.h | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index ee9186b..53fd038 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -185,7 +185,7 @@ void HeapStatisticsCollector::InitiateCollection() { base::Unretained(this), base::MessageLoopProxy::current(), round_id_); - workers_to_go_ = RenderThread::Get()->PostTaskToAllWorkers(collect); + workers_to_go_ = RenderThread::Get()->PostTaskToAllWebWorkers(collect); if (workers_to_go_) { // The guard task to send out partial stats // in case some workers are not responsive. @@ -230,9 +230,8 @@ void HeapStatisticsCollector::ReceiveStats(int round_id, return; total_bytes_ += total_bytes; used_bytes_ += used_bytes; - if (!--workers_to_go_) { + if (!--workers_to_go_) SendStatsToBrowser(round_id); - } } void HeapStatisticsCollector::SendStatsToBrowser(int round_id) { diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h index 0a82ae3..28ebacb 100644 --- a/content/public/renderer/render_thread.h +++ b/content/public/renderer/render_thread.h @@ -107,7 +107,7 @@ class CONTENT_EXPORT RenderThread : public IPC::Sender { virtual void UpdateHistograms(int sequence_number) = 0; // Post task to all worker threads. Returns number of workers. - virtual int PostTaskToAllWorkers(const base::Closure& closure) = 0; + virtual int PostTaskToAllWebWorkers(const base::Closure& closure) = 0; // Resolve the proxy servers to use for a given url. On success true is // returned and |proxy_list| is set to a PAC string containing a list of diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index 564a278..be1caf2 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -182,7 +182,7 @@ void MockRenderThread::ToggleWebKitSharedTimer(bool suspend) { void MockRenderThread::UpdateHistograms(int sequence_number) { } -int MockRenderThread::PostTaskToAllWorkers(const base::Closure& closure) { +int MockRenderThread::PostTaskToAllWebWorkers(const base::Closure& closure) { return 0; } diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h index e473d8f..a404c64 100644 --- a/content/public/test/mock_render_thread.h +++ b/content/public/test/mock_render_thread.h @@ -69,7 +69,7 @@ class MockRenderThread : public RenderThread { int64 idle_notification_delay_in_ms) OVERRIDE; virtual void ToggleWebKitSharedTimer(bool suspend) OVERRIDE; virtual void UpdateHistograms(int sequence_number) OVERRIDE; - virtual int PostTaskToAllWorkers(const base::Closure& closure) OVERRIDE; + virtual int PostTaskToAllWebWorkers(const base::Closure& closure) OVERRIDE; virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) OVERRIDE; #if defined(OS_WIN) virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 63610a9..d6c94a4 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -859,7 +859,7 @@ void RenderThreadImpl::UpdateHistograms(int sequence_number) { child_histogram_message_filter()->SendHistograms(sequence_number); } -int RenderThreadImpl::PostTaskToAllWorkers(const base::Closure& closure) { +int RenderThreadImpl::PostTaskToAllWebWorkers(const base::Closure& closure) { return webkit_glue::WorkerTaskRunner::Instance()->PostTaskToAllThreads( closure); } diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index c76a7f4..63cc80c 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -147,7 +147,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, int64 idle_notification_delay_in_ms) OVERRIDE; virtual void ToggleWebKitSharedTimer(bool suspend) OVERRIDE; virtual void UpdateHistograms(int sequence_number) OVERRIDE; - virtual int PostTaskToAllWorkers(const base::Closure& closure) OVERRIDE; + virtual int PostTaskToAllWebWorkers(const base::Closure& closure) OVERRIDE; virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) OVERRIDE; #if defined(OS_WIN) virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE; |