diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 02:46:32 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 02:46:32 +0000 |
| commit | 4dee39c5d979e25a0515e3f97d3657a464dd7d79 (patch) | |
| tree | 1a3a2ed1cd9fd76add29a031cff77aa283bb72ca /chrome | |
| parent | b7db3e989e5bb7fbfef46d09c0f36c1c3ef3dc43 (diff) | |
| download | chromium_src-4dee39c5d979e25a0515e3f97d3657a464dd7d79.zip chromium_src-4dee39c5d979e25a0515e3f97d3657a464dd7d79.tar.gz chromium_src-4dee39c5d979e25a0515e3f97d3657a464dd7d79.tar.bz2 | |
Revert 28692
It induced a leak detected by valgrind, so I'll revert, and look more
closely when I'm in on Monday.
TBR=raman
Review URL: http://codereview.chromium.org/268033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/histogram_synchronizer.cc | 2 | ||||
| -rw-r--r-- | chrome/common/histogram_synchronizer.h | 9 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 6 |
3 files changed, 0 insertions, 17 deletions
diff --git a/chrome/common/histogram_synchronizer.cc b/chrome/common/histogram_synchronizer.cc index aaf23e8..54ff230 100644 --- a/chrome/common/histogram_synchronizer.cc +++ b/chrome/common/histogram_synchronizer.cc @@ -241,8 +241,6 @@ int HistogramSynchronizer::GetNextAvaibleSequenceNumber( RendererHistogramRequester requester) { AutoLock auto_lock(lock_); ++next_available_sequence_number_; - if (next_available_sequence_number_ < STARTING_SEQUENCE_NUMBER) - next_available_sequence_number_ = STARTING_SEQUENCE_NUMBER; if (requester == ASYNC_HISTOGRAMS) { async_sequence_number_ = next_available_sequence_number_; async_renderers_pending_ = 0; diff --git a/chrome/common/histogram_synchronizer.h b/chrome/common/histogram_synchronizer.h index 29c34e2..ed866fc 100644 --- a/chrome/common/histogram_synchronizer.h +++ b/chrome/common/histogram_synchronizer.h @@ -32,15 +32,6 @@ class HistogramSynchronizer : public SYNCHRONOUS_HISTOGRAMS }; - // We reserve 0 through 9 sequence numbers for special purposes. For example, - // sequence number 0 is used by renderer to send its histograms before it - // closing renderer. We wanted to reserve the rest of sequence numbers for - // future purposes. - enum SequenceNumbers { - RENDERER_CLOSING_SEQUENCE_NUMBER = 0, - STARTING_SEQUENCE_NUMBER = 10 - }; - HistogramSynchronizer(); ~HistogramSynchronizer(); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 1ec124d..09fbe86 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -26,7 +26,6 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/histogram_synchronizer.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/page_zoom.h" #include "chrome/common/plugin_messages.h" @@ -3162,11 +3161,6 @@ void RenderView::OnClosePage(const ViewMsg_ClosePage_Params& params) { } webview()->dispatchUnloadEvent(); - // Send histogram data before renderer closes. - if (RenderThread::current()) - RenderThread::current()->SendHistograms( - HistogramSynchronizer::RENDERER_CLOSING_SEQUENCE_NUMBER); - // Just echo back the params in the ACK. Send(new ViewHostMsg_ClosePage_ACK(routing_id_, params)); } |