Revert 175632

cc/thread_proxy.cc

 // Copyright 2011 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 "cc/thread_proxy.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/delay_based_time_source.h"
 #include "cc/draw_quad.h"
@@ skipping 995 matching lines @@
         DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
         Proxy::implThread()->postTask(base::Bind(&ThreadProxy::commitPendingOnImplThreadForTesting, m_implThreadWeakPtr, &commitPendingRequest));
         commitPendingRequest.completion.wait();
     }
     return commitPendingRequest.commitPending;
 }
 
 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* request)
 {
     DCHECK(isImplThread());
-    if (m_layerTreeHostImpl->outputSurface())
-        request->commitPending = m_schedulerOnImplThread->commitPending();
+    request->commitPending = m_schedulerOnImplThread->commitPending();
     request->completion.signal();
 }
 
 skia::RefPtr<SkPicture> ThreadProxy::capturePicture()
 {
     DCHECK(isMainThread());
     CompletionEvent completion;
     skia::RefPtr<SkPicture> picture;
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
         Proxy::implThread()->postTask(base::Bind(&ThreadProxy::capturePictureOnImplThread,
                                                  m_implThreadWeakPtr,
                                                  &completion,
                                                  &picture));
         completion.wait();
     }
     return picture;
 }
 
 void ThreadProxy::capturePictureOnImplThread(CompletionEvent* completion, skia::RefPtr<SkPicture>* picture)
 {
     DCHECK(isImplThread());
     *picture = m_layerTreeHostImpl->capturePicture();
     completion->signal();
 }
 
 }  // namespace cc