diff options
author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 20:40:14 +0000 |
---|---|---|
committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 20:40:14 +0000 |
commit | b68e90f448a93b7779d538480f19dfcc4b7095ac (patch) | |
tree | 1ae8cdf188729dae7c0acc383b15f85f868892fd | |
parent | e3d71ec17455b85384493160c15a1bf165351972 (diff) | |
download | chromium_src-b68e90f448a93b7779d538480f19dfcc4b7095ac.zip chromium_src-b68e90f448a93b7779d538480f19dfcc4b7095ac.tar.gz chromium_src-b68e90f448a93b7779d538480f19dfcc4b7095ac.tar.bz2 |
Restore field trial for memory model
Rollback was not needed to correct distributed test regression.
This reverts changes in 3608, which were done to try to repair the
regression.
r=huanr
Review URL: http://codereview.chromium.org/7522
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3627 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/browser_process_impl.cc | 2 | ||||
-rw-r--r-- | chrome/browser/render_widget_host_view_win.cc | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index c28f8c1..d4aabe7 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -117,7 +117,6 @@ BrowserProcessImpl::BrowserProcessImpl(CommandLine& command_line) memory_model_ = MEDIUM_MEMORY_MODEL; } } else { -#if 0 // TODO(jar): Comment out setting of fix UI reliability regression. // Randomly choose what memory model to use. const double probability = 0.5; FieldTrial* trial(new FieldTrial(BrowserTrial::kMemoryModelFieldTrial, @@ -127,7 +126,6 @@ BrowserProcessImpl::BrowserProcessImpl(CommandLine& command_line) memory_model_ = HIGH_MEMORY_MODEL; else memory_model_ = MEDIUM_MEMORY_MODEL; -#endif // 0. } suspend_controller_ = new SuspendController(); diff --git a/chrome/browser/render_widget_host_view_win.cc b/chrome/browser/render_widget_host_view_win.cc index 4af8a8c..eef290f 100644 --- a/chrome/browser/render_widget_host_view_win.cc +++ b/chrome/browser/render_widget_host_view_win.cc @@ -435,7 +435,6 @@ void RenderWidgetHostViewWin::OnPaint(HDC dc) { if (!whiteout_start_time_.is_null()) { TimeDelta whiteout_duration = TimeTicks::Now() - whiteout_start_time_; -#if 0 // TODO(jar): temp rollback to fix UI reliability regression // If field trial is active, report results in special histogram. static scoped_refptr<FieldTrial> trial( FieldTrialList::Find(BrowserTrial::kMemoryModelFieldTrial)); @@ -449,9 +448,6 @@ void RenderWidgetHostViewWin::OnPaint(HDC dc) { } else { UMA_HISTOGRAM_TIMES(L"MPArch.RWHH_WhiteoutDuration", whiteout_duration); } -#else - UMA_HISTOGRAM_TIMES(L"MPArch.RWHH_WhiteoutDuration", whiteout_duration); -#endif // 0. // Reset the start time to 0 so that we start recording again the next // time the backing store is NULL... |