diff options
| author | fmeawad <fmeawad@chromium.org> | 2014-08-27 17:48:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 00:49:08 +0000 |
| commit | 3a38fb5efd526a2278ab3b577c8c7881a3ad4d20 (patch) | |
| tree | 414d30c4493bdff574ac0d483835ffaab8412ad6 /content | |
| parent | 8348200de4dbd124b18dd2ecbf6cd44368083012 (diff) | |
| download | chromium_src-3a38fb5efd526a2278ab3b577c8c7881a3ad4d20.zip chromium_src-3a38fb5efd526a2278ab3b577c8c7881a3ad4d20.tar.gz chromium_src-3a38fb5efd526a2278ab3b577c8c7881a3ad4d20.tar.bz2 | |
Revert of Initialize the now_funciton to the HighResNowWrapper in case High Res is supported (patchset #7 of https://codereview.chromium.org/446203002/)
Reason for revert:
It causes a Canary crash
https://code.google.com/p/chromium/issues/detail?id=408354
The added static initializer causes a crash in libpeerconnetion used by WebRTC
Fix to reland: remove static initializer.
Original issue's description:
> We have noticed a clock shift when QPC was deployed. It shows as a regression on the perf bots
> https://chromeperf.appspot.com/report?masters=ChromiumPerf&bots=chromium-rel-win8-dual&tests=startup.warm.dirty.blank_page%2Fwindow_display_time&rev=286928
>
> It is not a real regression, the initial_time and initial_ticks are not properly initialized when switching to HighResolution (i.e. QPC).
> This CL initializes the now_function to the HighResNowWrapper instead of setting it to RolloverProtectedNow then to the HighResNowWrapper.
>
> By doing that, we avoid getting an incorrect initial_time and initial_ticks using the RolloverProtectedNow and avoid having to reinitialize.
>
> BUG=158234
>
> Committed: https://chromium.googlesource.com/chromium/src/+/10c40c221c314e41add0a5b4df1ee7467681a430
TBR=jar@chromium.org,willchan@chromium.org,maruel@chromium.org,thakis@chromium.org,jam@chromium.org,cpu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=158234
Review URL: https://codereview.chromium.org/516693002
Cr-Commit-Position: refs/heads/master@{#292288}
Diffstat (limited to 'content')
| -rw-r--r-- | content/app/content_main_runner.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 32dd24e..9ee1274 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -666,6 +666,8 @@ class ContentMainRunnerImpl : public ContentMainRunner { MachBroker::ChildSendTaskPortToParent(); } #elif defined(OS_WIN) + base::TimeTicks::SetNowIsHighResNowIfSupported(); + bool init_device_scale_factor = true; if (command_line.HasSwitch(switches::kDeviceScaleFactor)) { std::string scale_factor_string = command_line.GetSwitchValueASCII( |