diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 19:04:21 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 19:04:21 +0000 |
| commit | 03cf96e71f1855f80a4b9214aab7c7fae60ec87c (patch) | |
| tree | af118309b7e143c83f20456858c68b3ac62e0da1 /cc | |
| parent | 89d1a8b163dc905efeea6d391f4d02deafccf59c (diff) | |
| download | chromium_src-03cf96e71f1855f80a4b9214aab7c7fae60ec87c.zip chromium_src-03cf96e71f1855f80a4b9214aab7c7fae60ec87c.tar.gz chromium_src-03cf96e71f1855f80a4b9214aab7c7fae60ec87c.tar.bz2 | |
Fix "unreachable code" warnings (MSVC warning 4702), misc. edition.
This CL covers top-level directories that only had one or two modified files.
BUG=346399
TEST=none
R=darin@chromium.org
Review URL: https://codereview.chromium.org/203043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/output/output_surface.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc index 87d6e84..9c52bcb 100644 --- a/cc/output/output_surface.cc +++ b/cc/output/output_surface.cc @@ -411,8 +411,8 @@ base::TimeDelta OutputSurface::GpuLatencyEstimate() { } void OutputSurface::UpdateAndMeasureGpuLatency() { - return; // http://crbug.com/306690 tracks re-enabling latency queries. - + // http://crbug.com/306690 tracks re-enabling latency queries. +#if 0 // We only care about GPU latency for surfaces that do not have a parent // compositor, since surfaces that do have a parent compositor can use // mailboxes or delegated rendering to send frames to their parent without @@ -473,6 +473,7 @@ void OutputSurface::UpdateAndMeasureGpuLatency() { gpu_latency_query_id); context_provider_->ContextGL()->EndQueryEXT(GL_LATENCY_QUERY_CHROMIUM); pending_gpu_latency_query_ids_.push_back(gpu_latency_query_id); +#endif } void OutputSurface::PostSwapBuffersComplete() { |