gpu: Only estimate parent compositor run time when needed

content/renderer/gpu/compositor_output_surface.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/gpu/compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 58 matching lines @@
       main_thread_handle_(base::PlatformThread::CurrentHandle()),
 #endif
       layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
       weak_ptrs_(this) {
   DCHECK(output_surface_filter_.get());
   DetachFromThread();
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
   DCHECK(message_sender_.get());
   if (OutputSurface::software_device())
     capabilities_.max_frames_pending = 1;
+#if defined(OS_ANDROID)

[piman, 2014/06/13 20:46:43]

Why android only? All platforms but Mac* use delegated.
Can we make this common between platforms?

*Mac may go delegated for 37.

[Sami, 2014/06/16 13:15:04]

Yeah, I was wondering if this should be done more generally. Is this really a
question of delegated vs. non-delegated, though? On Android the browser
compositor runtime is subtracted from the deadline, so we need this to avoid
doing the same adjustment twice. I'm not sure if that happens on other platforms
yet, but I'm thinking it should since the browser is in the best place to do
that adjustment.

+  capabilities_.adjust_deadline_for_parent = false;
+#endif
 }
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
   SetNeedsBeginFrame(false);
   if (!HasClient())
     return;
   UpdateSmoothnessTakesPriority(false);
   if (output_surface_proxy_.get())
     output_surface_proxy_->ClearOutputSurface();
@@ skipping 186 matching lines @@
   // If this is the last surface to stop preferring smoothness,
   // Reset the main thread's priority to the default.
   if (prefers_smoothness_ == true &&
       --g_prefer_smoothness_count == 0) {
     SetThreadPriorityToDefault(main_thread_handle_);
   }
   prefers_smoothness_ = prefers_smoothness;
 }
 
 }  // namespace content