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

Unified Diff: content/browser/renderer_host/media/audio_sync_reader.h

Issue 9317001: Revert 119769 - Switch AudioDevice classes from SyncSocket to CancelableSyncSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_sync_reader.h
===================================================================
--- content/browser/renderer_host/media/audio_sync_reader.h (revision 119920)
+++ content/browser/renderer_host/media/audio_sync_reader.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
@@ -45,12 +45,12 @@
base::SharedMemory* shared_memory_;
base::Time previous_call_time_;
- // Socket for transmitting audio data.
- scoped_ptr<base::CancelableSyncSocket> socket_;
+ // A pair of SyncSocket for transmitting audio data.
+ scoped_ptr<base::SyncSocket> socket_;
- // Socket to be used by the renderer. The reference is released after
+ // SyncSocket to be used by the renderer. The reference is released after
// PrepareForeignSocketHandle() is called and ran successfully.
- scoped_ptr<base::CancelableSyncSocket> foreign_socket_;
+ scoped_ptr<base::SyncSocket> foreign_socket_;
// Protect socket_ access by lock to prevent race condition when audio
// controller thread closes the reader and hardware audio thread is reading

Powered by Google App Engine
This is Rietveld 408576698