Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Side by Side Diff: content/browser/renderer_host/media/desktop_capture_device_aura.cc

Issue 161413002: Revert of Read compositor VSync information from platform, when possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/desktop_capture_device_aura.h" 5 #include "content/browser/renderer_host/media/desktop_capture_device_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/timer/timer.h" 8 #include "base/timer/timer.h"
9 #include "cc/output/copy_output_request.h" 9 #include "cc/output/copy_output_request.h"
10 #include "cc/output/copy_output_result.h" 10 #include "cc/output/copy_output_result.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 106 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
107 107
108 // Implements ui::CompositorObserver. 108 // Implements ui::CompositorObserver.
109 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {} 109 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {}
110 virtual void OnCompositingStarted(ui::Compositor* compositor, 110 virtual void OnCompositingStarted(ui::Compositor* compositor,
111 base::TimeTicks start_time) OVERRIDE {} 111 base::TimeTicks start_time) OVERRIDE {}
112 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; 112 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;
113 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE {} 113 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE {}
114 virtual void OnCompositingLockStateChanged( 114 virtual void OnCompositingLockStateChanged(
115 ui::Compositor* compositor) OVERRIDE {} 115 ui::Compositor* compositor) OVERRIDE {}
116 virtual void OnUpdateVSyncParameters(ui::Compositor* compositor,
117 base::TimeTicks timebase,
118 base::TimeDelta interval) OVERRIDE {}
116 119
117 private: 120 private:
118 // Captures a frame. 121 // Captures a frame.
119 // |dirty| is false for timer polls and true for compositor updates. 122 // |dirty| is false for timer polls and true for compositor updates.
120 void Capture(bool dirty); 123 void Capture(bool dirty);
121 124
122 // Update capture size. Must be called on the UI thread. 125 // Update capture size. Must be called on the UI thread.
123 void UpdateCaptureSize(); 126 void UpdateCaptureSize();
124 127
125 // Response callback for cc::Layer::RequestCopyOfOutput(). 128 // Response callback for cc::Layer::RequestCopyOfOutput().
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 scoped_ptr<Client> client) { 442 scoped_ptr<Client> client) {
440 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); 443 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
441 impl_->AllocateAndStart(params, client.Pass()); 444 impl_->AllocateAndStart(params, client.Pass());
442 } 445 }
443 446
444 void DesktopCaptureDeviceAura::StopAndDeAllocate() { 447 void DesktopCaptureDeviceAura::StopAndDeAllocate() {
445 impl_->StopAndDeAllocate(); 448 impl_->StopAndDeAllocate();
446 } 449 }
447 450
448 } // namespace content 451 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698