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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/pipeline_integration_test_base.h

Issue 12262058: Revert r180578, r180591, and r180604 from 1410 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test_base.h
===================================================================
--- media/filters/pipeline_integration_test_base.h (revision 182591)
+++ media/filters/pipeline_integration_test_base.h (working copy)
@@ -74,6 +74,7 @@
base::MD5Context md5_context_;
bool hashing_enabled_;
scoped_refptr<Pipeline> pipeline_;
+ scoped_refptr<VideoRendererBase> renderer_;
scoped_refptr<NullAudioSink> audio_sink_;
bool ended_;
PipelineStatus pipeline_status_;
@@ -89,7 +90,7 @@
const scoped_refptr<Demuxer>& demuxer, Decryptor* decryptor);
void SetDecryptor(Decryptor* decryptor,
const DecryptorReadyCB& decryptor_ready_cb);
- void OnVideoRendererPaint(const scoped_refptr<VideoFrame>& frame);
+ void OnVideoRendererPaint();
MOCK_METHOD1(OnSetOpaque, void(bool));
MOCK_METHOD1(OnBufferingState, void(Pipeline::BufferingState));
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698